diff --git a/build.gradle b/build.gradle index 93ec8ec..ffa9178 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,4 @@ +import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { @@ -12,9 +13,9 @@ commonConfig { allprojects { tasks.withType(KotlinCompile).configureEach { - kotlinOptions { - apiVersion = "1.5" - languageVersion = "1.5" + compilerOptions { + apiVersion = KotlinVersion.KOTLIN_1_5 + languageVersion = KotlinVersion.KOTLIN_1_5 } } pluginManager.withPlugin("kotlin") { diff --git a/gradle.properties b/gradle.properties index f060897..f96cdd6 100755 --- a/gradle.properties +++ b/gradle.properties @@ -6,5 +6,3 @@ kotlin.code.style=official kotlin.incremental=true kotlin.caching.enabled=true android.nonTransitiveRClass=true -# https://issuetracker.google.com/issues/266279660 -android.experimental.androidTest.useUnifiedTestPlatform=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 09c670d..9e26573 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ google-androidtest = "1.5.2" google-androidtestext = "1.1.5" maven-threetenbp = "1.6.8" maven-junit = "4.13.2" -maven-truth = "1.1.5" +maven-truth = "1.2.0" maven-ticktock = "1.2.0-2021e" maven-binarycompatiblity = "0.13.2" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135..d64cd49 100755 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ