diff options
| -rw-r--r-- | build-logic/build.gradle.kts | 2 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt | 4 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index a3914ac8..4dc0e4b3 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -5,7 +5,7 @@ plugins { `kotlin-dsl` } -kotlin.jvmToolchain(20) +kotlin.jvmToolchain(17) gradlePlugin { plugins { diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt index ece42f92..5588f621 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt @@ -25,7 +25,7 @@ internal fun Project.configureSlimTests() { extensions.findByType<LibraryAndroidComponentsExtension>()?.run { beforeVariants(selector().withBuildType(BUILD_TYPE_RELEASE)) { (it as HasUnitTestBuilder).enableUnitTest = false - it.androidTest.enable = false + it.enableAndroidTest = true } } @@ -37,7 +37,7 @@ internal fun Project.configureSlimTests() { } beforeVariants(selector().withFlavor(FlavorDimensions.FREE to ProductFlavors.NON_FREE)) { (it as HasUnitTestBuilder).enableUnitTest = false - it.androidTest.enable = false + it.enableAndroidTest = true } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f8ac9a32..95805f42 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,7 @@ [versions] -agp = "8.3.0-alpha16" +# Not using alpha track due to installRelease regression +# https://issuetracker.google.com/issues/315337463 +agp = "8.2.0" androidxActivity = "1.8.2" bouncycastle = "1.77" moshi = "1.15.0" |