From 4f22b3f458ef8c82abab4027a82232e37ef0b1e9 Mon Sep 17 00:00:00 2001 From: Surendar D Date: Tue, 14 May 2019 18:10:30 +0530 Subject: [PATCH] Demo commit --- .idea/sonarlint/issuestore/0/e/0eba5a6822592a9ec90776ca969c0f5287809ee5 | 3 +++ .idea/sonarlint/issuestore/f/0/f07866736216be0ee2aba49e392191aeae700a35 | 0 .idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164 | 0 .idea/sonarlint/issuestore/index.pb | 7 +++++++ app/build.gradle | 37 ++++--------------------------------- app/excel/release/app-excel-release.apk | Bin 2942016 -> 0 bytes app/excel/release/output.json | 2 +- app/sherbet/release/app-sherbet-release.apk | Bin 2539021 -> 0 bytes app/sherbet/release/output.json | 2 +- app/src/main/java/com/excel/multiflaver/MainActivity.java | 1 - build.gradle | 5 +---- 11 files changed, 17 insertions(+), 40 deletions(-) create mode 100644 .idea/sonarlint/issuestore/0/e/0eba5a6822592a9ec90776ca969c0f5287809ee5 create mode 100644 .idea/sonarlint/issuestore/f/0/f07866736216be0ee2aba49e392191aeae700a35 create mode 100644 .idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164 create mode 100644 .idea/sonarlint/issuestore/index.pb diff --git a/.idea/sonarlint/issuestore/0/e/0eba5a6822592a9ec90776ca969c0f5287809ee5 b/.idea/sonarlint/issuestore/0/e/0eba5a6822592a9ec90776ca969c0f5287809ee5 new file mode 100644 index 0000000..8583cac --- /dev/null +++ b/.idea/sonarlint/issuestore/0/e/0eba5a6822592a9ec90776ca969c0f5287809ee5 @@ -0,0 +1,3 @@ + +l squid:S1450 "URemove the "button" field and declare it as a local variable in the relevant methods.(Èòɹ +\squid:UselessImportCheck"3Remove this unused import 'android.graphics.Color'.(øãíòþÿÿÿÿ \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/f/0/f07866736216be0ee2aba49e392191aeae700a35 b/.idea/sonarlint/issuestore/f/0/f07866736216be0ee2aba49e392191aeae700a35 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/.idea/sonarlint/issuestore/f/0/f07866736216be0ee2aba49e392191aeae700a35 diff --git a/.idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164 b/.idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/.idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164 diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb new file mode 100644 index 0000000..a4e3b68 --- /dev/null +++ b/.idea/sonarlint/issuestore/index.pb @@ -0,0 +1,7 @@ + +@ +app/build.gradle,f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164 +i +9app/src/main/java/com/excel/multiflaver/MainActivity.java,0/e/0eba5a6822592a9ec90776ca969c0f5287809ee5 +< + build.gradle,f/0/f07866736216be0ee2aba49e392191aeae700a35 \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 13cefcf..c221379 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'com.android.application' -apply plugin: 'org.sonarqube' android { compileSdkVersion 28 defaultConfig { @@ -23,8 +22,8 @@ android { sherbet { applicationId "driver.sherbet.multiflaver" manifestPlaceholders = [appLabel: "Sherbet app", appIcon: "@mipmap/ic_launcher"] - versionCode 3 - versionName "1.3" + versionCode 4 + versionName "1.4" // buildConfigField "String", "PRIMARYCOLOR", "\"#000000\"" //buildConfigField "String", "SERVER_URL", "\"http://dev.myserver.com\"" buildConfigField "String", "BUILD_VARIANT", "\"sherbet\"" @@ -32,41 +31,13 @@ android { excel { applicationId "driver.excel.multiflaver" manifestPlaceholders = [appLabel: "Excel app", appIcon: "@mipmap/ic_launcher"] - versionCode 11 - versionName "1.1.2" + versionCode 12 + versionName "1.1.3" //buildConfigField "String", "PRIMARYCOLOR", "\"#FFFFFF\"" //buildConfigField "String", "SERVER_URL", "\"http://dev.myserver.com\"" buildConfigField "String", "BUILD_VARIANT", "\"excel\"" } } - sonarqube { - properties { - property "sonar.projectKey", "MultiFlaver" - property "sonar.login", "1f97dce11a8c32441874165a97737d8a854f24b6" - property "sonar.host.url", "http://localhost:9000" - //property "sonar.java.binaries", "${sourceSets.main.output.classesDir}" - //property "sonar.login", "admin" - //property "sonar.password", "admin" - - property "sonar.sources", "src/main/java" - // Defines where the java files are - property "sonar.binaries", "build/intermediates/javac/excelDebug" - //property "sonar.libraries", libraries - // Defines where the xml files are - property "sonar.java.binaries", "build/intermediates/javac/excelDebug/compileExcelDebugJavaWithJavac/classes" - //property "sonar.java.libraries", libraries - - //property "sonar.tests", "src/test/java, src/androidTest/java" - - //property "sonar.java.test.binaries", "build/intermediates/classes/debug" - //property "sonar.java.test.libraries", libraries - - //property "sonar.jacoco.reportPath", "build/jacoco/testDebugUnitTest.exec" - //property "sonar.java.coveragePlugin", "jacoco" - //property "sonar.junit.reportsPath", "build/test-results/Debug" - //property "sonar.android.lint.report", "build/outputs/lint-results.xml" - } - } } dependencies { diff --git a/app/excel/release/app-excel-release.apk b/app/excel/release/app-excel-release.apk index 976451d..09d0e53 100644 Binary files a/app/excel/release/app-excel-release.apk and b/app/excel/release/app-excel-release.apk differ diff --git a/app/excel/release/output.json b/app/excel/release/output.json index f0bcc0c..c721290 100644 --- a/app/excel/release/output.json +++ b/app/excel/release/output.json @@ -1 +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":{}}] \ No newline at end of file +[{"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":{}}] \ No newline at end of file diff --git a/app/sherbet/release/app-sherbet-release.apk b/app/sherbet/release/app-sherbet-release.apk index bc72da2..bdacea1 100644 Binary files a/app/sherbet/release/app-sherbet-release.apk and b/app/sherbet/release/app-sherbet-release.apk differ diff --git a/app/sherbet/release/output.json b/app/sherbet/release/output.json index 2f02d99..9ebddf1 100644 --- a/app/sherbet/release/output.json +++ b/app/sherbet/release/output.json @@ -1 +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":{}}] \ No newline at end of file +[{"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":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/excel/multiflaver/MainActivity.java b/app/src/main/java/com/excel/multiflaver/MainActivity.java index a408991..bda1f8c 100644 --- a/app/src/main/java/com/excel/multiflaver/MainActivity.java +++ b/app/src/main/java/com/excel/multiflaver/MainActivity.java @@ -15,7 +15,6 @@ public class MainActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); button = (Button) findViewById(R.id.button); - Toast.makeText(MainActivity.this, "Current Tenant -- " + BuildConfig.BUILD_VARIANT, Toast.LENGTH_LONG).show(); } diff --git a/build.gradle b/build.gradle index ecd4350..76bea55 100644 --- a/build.gradle +++ b/build.gradle @@ -4,13 +4,10 @@ buildscript { repositories { google() jcenter() - maven { url "https://plugins.gradle.org/m2/" } - } dependencies { classpath 'com.android.tools.build:gradle:3.4.0' - classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6' - + // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } -- libgit2 0.21.0