Play-core 1.10.2

motorro · Sep 22, 2021 · 22fed49 · 22fed49
1 parent dabbd92
commit 22fed49
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 36 deletions.
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/appupdatewrapper/build.gradle b/appupdatewrapper/build.gradle
@@ -42,12 +42,6 @@ android {
         versionName versionName
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                includeCompileClasspath false
-            }
-        }
     }
 
     buildTypes {
@@ -67,15 +61,15 @@ dependencies {
 
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    api 'androidx.core:core-ktx:1.6.0-beta01'
+    api 'androidx.core:core-ktx:1.6.0'
     kapt 'androidx.lifecycle:lifecycle-common-java8:2.3.1'
-    api 'com.google.android.play:core:1.10.0'
+    api 'com.google.android.play:core:1.10.2'
 
-    implementation 'com.jakewharton.timber:timber:4.7.1'
+    implementation 'com.jakewharton.timber:timber:5.0.1'
 
     testImplementation project(":testapp")
-    testImplementation 'androidx.test:core:1.3.0'
-    testImplementation 'androidx.test.ext:junit:1.1.2'
+    testImplementation 'androidx.test:core:1.4.0'
+    testImplementation 'androidx.test.ext:junit:1.1.3'
     testImplementation 'junit:junit:4.13.2'
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'

diff --git a/appupdatewrapper/src/test/java/com/motorro/appupdatewrapper/LogUtilsKtTest.kt b/appupdatewrapper/src/test/java/com/motorro/appupdatewrapper/LogUtilsKtTest.kt
@@ -44,7 +44,7 @@ class LogUtilsKtTest: TestAppTest() {
         class Test: Tagged {
             override fun getTagPrefix(): String = "Internal"
         }
-        assertEquals("$LIBRARY_LOG_PREFIX:Internal:createsLoggingTag\$Test", Test().getTag())
+        assertEquals("$LIBRARY_LOG_PREFIX:Internal:Test", Test().getTag())
     }
 
     @Test

diff --git a/appupdatewrapper/src/test/java/com/motorro/appupdatewrapper/TestAppTest.kt b/appupdatewrapper/src/test/java/com/motorro/appupdatewrapper/TestAppTest.kt
@@ -35,7 +35,7 @@ open class TestAppTest{
         @JvmStatic
         fun installTimber() {
             // Just to test we don't crash in logging
-            if (0 == Timber.treeCount()) {
+            if (0 == Timber.treeCount) {
                 Timber.plant(Timber.DebugTree())
             }
         }

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ apply from: 'gradle/maven-publish-config.gradle'
 apply plugin: 'io.github.gradle-nexus.publish-plugin'
 
 buildscript {
-    ext.kotlin_version = '1.5.10'
+    ext.kotlin_version = '1.5.31'
     ext.dokka_version = '1.4.32'
     repositories {
         google()
@@ -21,7 +21,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"

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.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -45,8 +45,8 @@ android {
 dependencies {
     implementation project(":appupdatewrapper")
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.5.0'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'com.google.android.material:material:1.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
 }
diff --git a/testapp/build.gradle b/testapp/build.gradle
@@ -23,14 +23,12 @@ android {
     defaultConfig {
         minSdkVersion androidMinSdkVersion
         targetSdkVersion androidTargetSdkVersion
-        versionCode versionCode
-        versionName versionName
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 }
 
 dependencies {
     implementation project(":appupdatewrapper")
-    api 'androidx.appcompat:appcompat:1.3.0'
+    api 'androidx.appcompat:appcompat:1.3.1'
 }