Surendar D / MultiFlaver

Download as
Browse Code »

Commit 4f22b3f458ef8c82abab4027a82232e37ef0b1e9

Authored by Surendar D
1 parent 9bdf5ea2
Exists in master

Demo commit

Showing 11 changed files with 17 additions and 40 deletions   Show diff stats
.idea/sonarlint/issuestore/0/e/0eba5a6822592a9ec90776ca969c0f5287809ee5 0 → 100644
View file @4f22b3f
No preview for this file type
.idea/sonarlint/issuestore/f/0/f07866736216be0ee2aba49e392191aeae700a35 0 → 100644
  Diff comments   View file @4f22b3f
.idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164 0 → 100644
  Diff comments   View file @4f22b3f
.idea/sonarlint/issuestore/index.pb 0 → 100644
View file @4f22b3f
No preview for this file type
app/build.gradle
  Diff comments   View file @4f22b3f
1 apply plugin: 'com.android.application' 1 apply plugin: 'com.android.application'
2 -apply plugin: 'org.sonarqube'  
3 android { 2 android {
4 compileSdkVersion 28 3 compileSdkVersion 28
5 defaultConfig { 4 defaultConfig {
@@ -23,8 +22,8 @@ android { @@ -23,8 +22,8 @@ android {
23 sherbet { 22 sherbet {
24 applicationId "driver.sherbet.multiflaver" 23 applicationId "driver.sherbet.multiflaver"
25 manifestPlaceholders = [appLabel: "Sherbet app", appIcon: "@mipmap/ic_launcher"] 24 manifestPlaceholders = [appLabel: "Sherbet app", appIcon: "@mipmap/ic_launcher"]
26 - versionCode 3  
27 - versionName "1.3" 25 + versionCode 4
  26 + versionName "1.4"
28 // buildConfigField "String", "PRIMARYCOLOR", "\"#000000\"" 27 // buildConfigField "String", "PRIMARYCOLOR", "\"#000000\""
29 //buildConfigField "String", "SERVER_URL", "\"http://dev.myserver.com\"" 28 //buildConfigField "String", "SERVER_URL", "\"http://dev.myserver.com\""
30 buildConfigField "String", "BUILD_VARIANT", "\"sherbet\"" 29 buildConfigField "String", "BUILD_VARIANT", "\"sherbet\""
@@ -32,41 +31,13 @@ android { @@ -32,41 +31,13 @@ android {
32 excel { 31 excel {
33 applicationId "driver.excel.multiflaver" 32 applicationId "driver.excel.multiflaver"
34 manifestPlaceholders = [appLabel: "Excel app", appIcon: "@mipmap/ic_launcher"] 33 manifestPlaceholders = [appLabel: "Excel app", appIcon: "@mipmap/ic_launcher"]
35 - versionCode 11  
36 - versionName "1.1.2" 34 + versionCode 12
  35 + versionName "1.1.3"
37 //buildConfigField "String", "PRIMARYCOLOR", "\"#FFFFFF\"" 36 //buildConfigField "String", "PRIMARYCOLOR", "\"#FFFFFF\""
38 //buildConfigField "String", "SERVER_URL", "\"http://dev.myserver.com\"" 37 //buildConfigField "String", "SERVER_URL", "\"http://dev.myserver.com\""
39 buildConfigField "String", "BUILD_VARIANT", "\"excel\"" 38 buildConfigField "String", "BUILD_VARIANT", "\"excel\""
40 } 39 }
41 } 40 }
42 - sonarqube {  
43 - properties {  
44 - property "sonar.projectKey", "MultiFlaver"  
45 - property "sonar.login", "1f97dce11a8c32441874165a97737d8a854f24b6"  
46 - property "sonar.host.url", "http://localhost:9000"  
47 - //property "sonar.java.binaries", "${sourceSets.main.output.classesDir}"  
48 - //property "sonar.login", "admin"  
49 - //property "sonar.password", "admin"  
50 -  
51 - property "sonar.sources", "src/main/java"  
52 - // Defines where the java files are  
53 - property "sonar.binaries", "build/intermediates/javac/excelDebug"  
54 - //property "sonar.libraries", libraries  
55 - // Defines where the xml files are  
56 - property "sonar.java.binaries", "build/intermediates/javac/excelDebug/compileExcelDebugJavaWithJavac/classes"  
57 - //property "sonar.java.libraries", libraries  
58 -  
59 - //property "sonar.tests", "src/test/java, src/androidTest/java"  
60 -  
61 - //property "sonar.java.test.binaries", "build/intermediates/classes/debug"  
62 - //property "sonar.java.test.libraries", libraries  
63 -  
64 - //property "sonar.jacoco.reportPath", "build/jacoco/testDebugUnitTest.exec"  
65 - //property "sonar.java.coveragePlugin", "jacoco"  
66 - //property "sonar.junit.reportsPath", "build/test-results/Debug"  
67 - //property "sonar.android.lint.report", "build/outputs/lint-results.xml"  
68 - }  
69 - }  
70 } 41 }
71 42
72 dependencies { 43 dependencies {
app/excel/release/app-excel-release.apk
View file @4f22b3f
No preview for this file type
app/excel/release/output.json
  Diff comments   View file @4f22b3f
1 -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"1.1.2","enabled":true,"outputFile":"app-excel-release.apk","fullName":"excelRelease","baseName":"excel-release"},"path":"app-excel-release.apk","properties":{}}]  
2 \ No newline at end of file 1 \ No newline at end of file
  2 +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":12,"versionName":"1.1.3","enabled":true,"outputFile":"app-excel-release.apk","fullName":"excelRelease","baseName":"excel-release"},"path":"app-excel-release.apk","properties":{}}]
3 \ No newline at end of file 3 \ No newline at end of file
app/sherbet/release/app-sherbet-release.apk
View file @4f22b3f
No preview for this file type
app/sherbet/release/output.json
  Diff comments   View file @4f22b3f
1 -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"1.3","enabled":true,"outputFile":"app-sherbet-release.apk","fullName":"sherbetRelease","baseName":"sherbet-release"},"path":"app-sherbet-release.apk","properties":{}}]  
2 \ No newline at end of file 1 \ No newline at end of file
  2 +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"1.4","enabled":true,"outputFile":"app-sherbet-release.apk","fullName":"sherbetRelease","baseName":"sherbet-release"},"path":"app-sherbet-release.apk","properties":{}}]
3 \ No newline at end of file 3 \ No newline at end of file
app/src/main/java/com/excel/multiflaver/MainActivity.java
  Diff comments   View file @4f22b3f
@@ -15,7 +15,6 @@ public class MainActivity extends AppCompatActivity { @@ -15,7 +15,6 @@ public class MainActivity extends AppCompatActivity {
15 super.onCreate(savedInstanceState); 15 super.onCreate(savedInstanceState);
16 setContentView(R.layout.activity_main); 16 setContentView(R.layout.activity_main);
17 button = (Button) findViewById(R.id.button); 17 button = (Button) findViewById(R.id.button);
18 -  
19 Toast.makeText(MainActivity.this, "Current Tenant -- " + BuildConfig.BUILD_VARIANT, Toast.LENGTH_LONG).show(); 18 Toast.makeText(MainActivity.this, "Current Tenant -- " + BuildConfig.BUILD_VARIANT, Toast.LENGTH_LONG).show();
20 19
21 } 20 }
@@ -4,13 +4,10 @@ buildscript { @@ -4,13 +4,10 @@ buildscript {
4 repositories { 4 repositories {
5 google() 5 google()
6 jcenter() 6 jcenter()
7 - maven { url "https://plugins.gradle.org/m2/" }  
8 -  
9 } 7 }
10 dependencies { 8 dependencies {
11 classpath 'com.android.tools.build:gradle:3.4.0' 9 classpath 'com.android.tools.build:gradle:3.4.0'
12 - classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6'  
13 - 10 +
14 // NOTE: Do not place your application dependencies here; they belong 11 // NOTE: Do not place your application dependencies here; they belong
15 // in the individual module build.gradle files 12 // in the individual module build.gradle files
16 } 13 }