From 22fed49fb29e4ddac42f8378021b43cfa527d419 Mon Sep 17 00:00:00 2001 From: motorro Date: Wed, 22 Sep 2021 21:20:27 +0300 Subject: [PATCH] Play-core 1.10.2 --- .idea/runConfigurations.xml | 13 ------------- appupdatewrapper/build.gradle | 16 +++++----------- .../motorro/appupdatewrapper/LogUtilsKtTest.kt | 2 +- .../com/motorro/appupdatewrapper/TestAppTest.kt | 2 +- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- sample/build.gradle | 8 ++++---- testapp/build.gradle | 4 +--- 8 files changed, 15 insertions(+), 36 deletions(-) delete mode 100644 .idea/runConfigurations.xml diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index e497da9..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/appupdatewrapper/build.gradle b/appupdatewrapper/build.gradle index 1bee8c1..6ebe2f7 100644 --- 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 index fd77053..ddad5cd 100644 --- 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 index 11081b1..543782d 100644 --- 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 index 6436fde..47b864c 100644 --- 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 index 4d9ca16..0f80bbf 100644 --- 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 index 753bf82..a8cea22 100644 --- 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' } \ No newline at end of file diff --git a/testapp/build.gradle b/testapp/build.gradle index cecf8f2..69f175e 100644 --- a/testapp/build.gradle +++ b/testapp/build.gradle @@ -23,8 +23,6 @@ android { defaultConfig { minSdkVersion androidMinSdkVersion targetSdkVersion androidTargetSdkVersion - versionCode versionCode - versionName versionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -32,5 +30,5 @@ android { dependencies { implementation project(":appupdatewrapper") - api 'androidx.appcompat:appcompat:1.3.0' + api 'androidx.appcompat:appcompat:1.3.1' }