From ec72820ce96456ae30f1af8cde1979f4e9c7cd8f Mon Sep 17 00:00:00 2001 From: Surendar D Date: Mon, 13 May 2019 12:09:05 +0530 Subject: [PATCH] sonar push --- .idea/vcs.xml | 2 +- app/build.gradle | 20 +++++++++++++++++--- app/src/main/java/com/excel/multiflaver/MainActivity.java | 5 +++-- app/src/main/res/layout/activity_main.xml | 2 +- build.gradle | 2 ++ 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index d72b32c..c50155e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'com.android.application' - +apply plugin: 'org.sonarqube' android { compileSdkVersion 28 defaultConfig { @@ -25,14 +25,28 @@ android { manifestPlaceholders = [appLabel: "Sherbet app", appIcon: "@mipmap/ic_launcher"] versionCode 2 versionName "1.2" - buildConfigField "String", "PRIMARYCOLOR", "\"#000000\"" + // buildConfigField "String", "PRIMARYCOLOR", "\"#000000\"" + //buildConfigField "String", "SERVER_URL", "\"http://dev.myserver.com\"" + buildConfigField "String", "BUILD_VARIANT", "\"sherbet\"" } excel { applicationId "driver.excel.multiflaver" manifestPlaceholders = [appLabel: "Excel app", appIcon: "@mipmap/ic_launcher"] versionCode 10 versionName "1.1.1" - buildConfigField "String", "PRIMARYCOLOR", "\"#FFFFFF\"" + //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" } } } diff --git a/app/src/main/java/com/excel/multiflaver/MainActivity.java b/app/src/main/java/com/excel/multiflaver/MainActivity.java index d8f3968..77f01a9 100644 --- a/app/src/main/java/com/excel/multiflaver/MainActivity.java +++ b/app/src/main/java/com/excel/multiflaver/MainActivity.java @@ -4,6 +4,7 @@ import android.graphics.Color; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.widget.Button; +import android.widget.Toast; public class MainActivity extends AppCompatActivity { @@ -13,8 +14,8 @@ public class MainActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - button = (Button) findViewById(R.id.button); - button.setTextColor(Color.parseColor(BuildConfig.PRIMARYCOLOR)); + + Toast.makeText(MainActivity.this, "Current Tenant is -- " + BuildConfig.BUILD_VARIANT, Toast.LENGTH_LONG).show(); } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 81934cc..d8c3f30 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -110,7 +110,7 @@ android:drawableTint="@color/colorWhite" android:text="Log in to your account" android:textAllCaps="false" - android:textColor="#fff" + android:textColor="@color/colorAccent" android:textSize="14sp" /> diff --git a/build.gradle b/build.gradle index fafc1b9..ecd4350 100644 --- a/build.gradle +++ b/build.gradle @@ -4,10 +4,12 @@ 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