kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(deps): go back to AGP 8.3.x

Browse source
This commit is contained in:
Harsh Shandilya 2024-02-24 00:31:17 +05:30
parent 9ba9d1625f
commit cd0a638106
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build-logic/src/main/kotlin/app/passwordstore/gradle/flavors/SlimTests.kt
View file

@ -19,13 +19,14 @@ import org.gradle.kotlin.dsl.findByType
* Examples: `./gradlew test -PslimTests` will run unit tests for `nonFreeDebug` and `debug` build * 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. * variants in Android App and Library projects, and all tests in JVM projects.
*/ */
@Suppress("UnstableApiUsage")
internal fun Project.configureSlimTests() { internal fun Project.configureSlimTests() {
if (providers.gradleProperty(SLIM_TESTS_PROPERTY).isPresent) { if (providers.gradleProperty(SLIM_TESTS_PROPERTY).isPresent) {
// Disable unit test tasks on the release build type for Android Library projects // Disable unit test tasks on the release build type for Android Library projects
extensions.findByType<LibraryAndroidComponentsExtension>()?.run { extensions.findByType<LibraryAndroidComponentsExtension>()?.run {
beforeVariants(selector().withBuildType(BUILD_TYPE_RELEASE)) { beforeVariants(selector().withBuildType(BUILD_TYPE_RELEASE)) {
(it as HasUnitTestBuilder).enableUnitTest = false (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)) { beforeVariants(selector().withFlavor(FlavorDimensions.FREE to ProductFlavors.NON_FREE)) {
(it as HasUnitTestBuilder).enableUnitTest = false (it as HasUnitTestBuilder).enableUnitTest = false
it.enableAndroidTest = true it.androidTest.enable = false
} }
} }
} }

4
gradle/libs.versions.toml
View file

@ -1,7 +1,5 @@
[versions] [versions]
# Not using alpha track due to installRelease regression agp = "8.3.0-rc02"
# https://issuetracker.google.com/issues/315337463
agp = "8.2.0"
androidxActivity = "1.9.0-alpha03" androidxActivity = "1.9.0-alpha03"
bouncycastle = "1.77" bouncycastle = "1.77"
# @keep used for kotlinCompilerExtensionVersion # @keep used for kotlinCompilerExtensionVersion