Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Workaround disallow changes by splitting configuration file setup #138

Merged
merged 1 commit into from
Apr 18, 2024
Merged

Workaround disallow changes by splitting configuration file setup #138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 28 additions & 24 deletions keeper-gradle-plugin/src/main/java/com/slack/keeper/KeeperPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,14 +291,31 @@ public class KeeperPlugin : Plugin<Project> {
)
)

afterEvaluate {
val prop =
layout.dir(inferAndroidTestUsageProvider.flatMap { it.outputProguardRules.asFile })
val testProguardFiles =
project.provider { testVariant.runtimeConfiguration.proguardFiles() }
val testProguardFile =
(testVariant.artifacts.unwrap()).get(InternalArtifactType.GENERATED_PROGUARD_FILE)
applyGeneratedRules(appVariant.name, prop, testProguardFiles, testProguardFile)
val prop =
layout.dir(inferAndroidTestUsageProvider.flatMap { it.outputProguardRules.asFile })

configureR8Task(appVariant.name) {
logger.debug("$TAG: Patching task '$name' with inferred androidTest proguard rules")
configurationFiles.from(prop)
}

val disableTestProguardFiles = project.hasProperty("keeper.disableTestProguardFiles")

if (!disableTestProguardFiles) {
// We offer an option to disable this because the FILTERED_PROGUARD_RULES doesn't
// propagate
// task dependencies and breaks in Gradle 8.
afterEvaluate {
val testProguardFiles =
project.provider { testVariant.runtimeConfiguration.proguardFiles() }
val testProguardFile =
(testVariant.artifacts.unwrap()).get(InternalArtifactType.GENERATED_PROGUARD_FILE)
configureR8Task(appVariant.name) {
logger.debug("$TAG: Patching task '$name' with test-specific proguard rules")
configurationFiles.from(testProguardFiles)
configurationFiles.from(testProguardFile)
}
}
}
}
}
Expand Down Expand Up @@ -355,29 +372,16 @@ public class KeeperPlugin : Plugin<Project> {
}
}

private fun Project.applyGeneratedRules(
private fun Project.configureR8Task(
appVariant: String,
prop: Provider<Directory>,
testProguardFiles: Provider<FileCollection>,
testProguardFile: Provider<RegularFile>
action: R8Task.() -> Unit,
) {
val targetName = interpolateR8TaskName(appVariant)

val disableTestProguardFiles = project.hasProperty("keeper.disableTestProguardFiles")
tasks
.withType(R8Task::class.java)
.matching { it.name == targetName }
.configureEach {
logger.debug("$TAG: Patching task '$name' with inferred androidTest proguard rules")
configurationFiles.from(prop)
// We offer an option to disable this because the FILTERED_PROGUARD_RULES doesn't
// propagate
// task dependencies and breaks in Gradle 8.
if (!disableTestProguardFiles) {
configurationFiles.from(testProguardFiles)
configurationFiles.from(testProguardFile)
}
}
.configureEach(action)
}

/**
Expand Down