Merge pull request #76 from AppDevNext/AndroidStudio-4.1

hannesa2 · web-flow · commit cf8004c80f12 · 2020-10-16T07:23:17.000+02:00
Android Studio 4.1
diff --git a/LogcatCoreLib/build.gradle b/LogcatCoreLib/build.gradle
@@ -8,6 +8,7 @@ android {
     defaultConfig {
         versionName getTag()
         versionCode getGitCommitCount()
+        buildConfigField "String", "VERSIONNAME", "\"" + getTag() + "\""
 
         minSdkVersion 16
         project.archivesBaseName = "LogcatCore"
diff --git a/LogcatCountlyLib/src/main/java/info/hannes/countly/Analytics.kt b/LogcatCountlyLib/src/main/java/info/hannes/countly/Analytics.kt
@@ -69,7 +69,7 @@ class Analytics : IAnalytics {
             } catch (ignore: PackageManager.NameNotFoundException) {
             }
             segmentation["app_version"] = version
-            segmentation["logging_version"] = BuildConfig.VERSION_NAME
+            segmentation["logging_version"] = BuildConfig.VERSIONNAME
 
             val config = CountlyConfig()
                     .setAppKey(countlyKey)
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:9.4.1"
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample/src/main/java/info/hannes/logcat/CrashlyticApplication.kt b/sample/src/main/java/info/hannes/logcat/CrashlyticApplication.kt
@@ -20,7 +20,7 @@ class CrashlyticApplication : Application() {
             Timber.plant(FileLoggingTree(it, this))
         }
 
-        FirebaseCrashlytics.getInstance().setCustomKey("VERSION_NAME", BuildConfig.VERSION_NAME)
+        FirebaseCrashlytics.getInstance().setCustomKey("VERSION_NAME", BuildConfig.VERSIONNAME)
         Timber.plant(CrashlyticsTree(Settings.Secure.getString(applicationContext.contentResolver, Settings.Secure.ANDROID_ID)))
 
         Timber.d("Debug test")

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class Analytics : IAnalytics {`
`69`	`69`	`} catch (ignore: PackageManager.NameNotFoundException) {`
`70`	`70`	`}`
`71`	`71`	`segmentation["app_version"] = version`
`72`		`- segmentation["logging_version"] = BuildConfig.VERSION_NAME`
	`72`	`+ segmentation["logging_version"] = BuildConfig.VERSIONNAME`
`73`	`73`
`74`	`74`	`val config = CountlyConfig()`
`75`	`75`	`.setAppKey(countlyKey)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ buildscript {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
`12`		`- classpath 'com.android.tools.build:gradle:4.0.2'`
	`12`	`+ classpath 'com.android.tools.build:gradle:4.1.0'`
`13`	`13`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`14`	`14`	`classpath "org.jlleitschuh.gradle:ktlint-gradle:9.4.1"`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class CrashlyticApplication : Application() {`
`20`	`20`	`Timber.plant(FileLoggingTree(it, this))`
`21`	`21`	`}`
`22`	`22`
`23`		`- FirebaseCrashlytics.getInstance().setCustomKey("VERSION_NAME", BuildConfig.VERSION_NAME)`
	`23`	`+ FirebaseCrashlytics.getInstance().setCustomKey("VERSION_NAME", BuildConfig.VERSIONNAME)`
`24`	`24`	`Timber.plant(CrashlyticsTree(Settings.Secure.getString(applicationContext.contentResolver, Settings.Secure.ANDROID_ID)))`
`25`	`25`
`26`	`26`	`Timber.d("Debug test")`