Skip to content

Commit 06a205f

Browse files
TapchicomaSpace
authored andcommitted
Fix 'debug.keystore' location also for 'com.android.test' plugin.
^KT-45745 In Progress
1 parent a043f77 commit 06a205f

File tree

1 file changed

+15
-6
lines changed
  • libraries/tools/gradle/android-test-fixes/src/main/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/fixes

1 file changed

+15
-6
lines changed

libraries/tools/gradle/android-test-fixes/src/main/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/fixes/debugKeystoreFix.kt

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
package org.jetbrains.kotlin.gradle.test.fixes.android.fixes
77

88
import com.android.build.gradle.AppExtension
9+
import com.android.build.gradle.BaseExtension
10+
import com.android.build.gradle.TestExtension
11+
import org.gradle.api.Action
12+
import org.gradle.api.Plugin
913
import org.gradle.api.Project
1014
import org.gradle.kotlin.dsl.configure
1115
import org.jetbrains.kotlin.gradle.test.fixes.android.TestFixesProperties
@@ -20,12 +24,17 @@ import org.jetbrains.kotlin.gradle.test.fixes.android.TestFixesProperties
2024
internal fun Project.applyDebugKeystoreFix(
2125
testFixesProperties: TestFixesProperties
2226
) {
23-
plugins.withId("com.android.application") {
24-
extensions.configure<AppExtension> {
25-
logger.info("Reconfiguring Android debug keystore")
26-
buildTypes.named("debug") {
27-
it.signingConfig?.storeFile = file(testFixesProperties.androidDebugKeystoreLocation)
28-
}
27+
plugins.withId("com.android.application", debugFix<AppExtension>(testFixesProperties))
28+
plugins.withId("com.android.test", debugFix<TestExtension>(testFixesProperties))
29+
}
30+
31+
private inline fun <reified AndroidExtension : BaseExtension> Project.debugFix(
32+
testFixesProperties: TestFixesProperties,
33+
): Action<Plugin<*>> = Action {
34+
extensions.configure<AndroidExtension> {
35+
logger.info("Reconfiguring Android debug keystore")
36+
buildTypes.named("debug") {
37+
it.signingConfig?.storeFile = file(testFixesProperties.androidDebugKeystoreLocation)
2938
}
3039
}
3140
}

0 commit comments

Comments
 (0)