From cd0a6381060aae859cb66f03edf64fc5ecbafffe Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 24 Feb 2024 00:31:17 +0530 Subject: fix(deps): go back to AGP 8.3.x --- .../src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt | 5 +++-- gradle/libs.versions.toml | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) 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 5588f621..7a3928c0 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 @@ -19,13 +19,14 @@ import org.gradle.kotlin.dsl.findByType * Examples: `./gradlew test -PslimTests` will run unit tests for `nonFreeDebug` and `debug` build * variants in Android App and Library projects, and all tests in JVM projects. */ +@Suppress("UnstableApiUsage") internal fun Project.configureSlimTests() { if (providers.gradleProperty(SLIM_TESTS_PROPERTY).isPresent) { // Disable unit test tasks on the release build type for Android Library projects extensions.findByType()?.run { beforeVariants(selector().withBuildType(BUILD_TYPE_RELEASE)) { (it as HasUnitTestBuilder).enableUnitTest = false - it.enableAndroidTest = true + it.androidTest.enable = false } } @@ -37,7 +38,7 @@ internal fun Project.configureSlimTests() { } beforeVariants(selector().withFlavor(FlavorDimensions.FREE to ProductFlavors.NON_FREE)) { (it as HasUnitTestBuilder).enableUnitTest = false - it.enableAndroidTest = true + it.androidTest.enable = false } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 51efc7e1..5997df5b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,5 @@ [versions] -# Not using alpha track due to installRelease regression -# https://issuetracker.google.com/issues/315337463 -agp = "8.2.0" +agp = "8.3.0-rc02" androidxActivity = "1.9.0-alpha03" bouncycastle = "1.77" # @keep used for kotlinCompilerExtensionVersion -- cgit v1.2.3