From 3db8b7ec526c7fb461c491b1135cc898a863a2c2 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Sun, 15 Oct 2023 14:08:24 -0400 Subject: [PATCH] Does... this work --- .../main/java/com/slack/keeper/InferAndroidTestKeepRules.kt | 4 ++-- .../src/main/java/com/slack/keeper/KeeperPlugin.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keeper-gradle-plugin/src/main/java/com/slack/keeper/InferAndroidTestKeepRules.kt b/keeper-gradle-plugin/src/main/java/com/slack/keeper/InferAndroidTestKeepRules.kt index 283d8c27..15616d28 100644 --- a/keeper-gradle-plugin/src/main/java/com/slack/keeper/InferAndroidTestKeepRules.kt +++ b/keeper-gradle-plugin/src/main/java/com/slack/keeper/InferAndroidTestKeepRules.kt @@ -19,7 +19,7 @@ import java.util.Locale import javax.inject.Inject import org.gradle.api.DefaultTask import org.gradle.api.NamedDomainObjectProvider -import org.gradle.api.artifacts.ResolvableConfiguration +import org.gradle.api.artifacts.DependencyScopeConfiguration import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.RegularFile import org.gradle.api.file.RegularFileProperty @@ -137,7 +137,7 @@ constructor(private val execOps: ExecOperations) : DefaultTask() { enableAssertions: Property, extensionJvmArgs: ListProperty, traceReferencesArgs: ListProperty, - r8Configuration: NamedDomainObjectProvider + r8Configuration: NamedDomainObjectProvider ): InferAndroidTestKeepRules.() -> Unit = { if (automaticallyAddR8Repo.get()) { // This is the maven repo where r8 tagged releases are hosted. Only the r8 artifact is diff --git a/keeper-gradle-plugin/src/main/java/com/slack/keeper/KeeperPlugin.kt b/keeper-gradle-plugin/src/main/java/com/slack/keeper/KeeperPlugin.kt index 2cd474a8..ac0dfda9 100644 --- a/keeper-gradle-plugin/src/main/java/com/slack/keeper/KeeperPlugin.kt +++ b/keeper-gradle-plugin/src/main/java/com/slack/keeper/KeeperPlugin.kt @@ -225,7 +225,7 @@ public class KeeperPlugin : Plugin { ) { // Set up r8 configuration val r8Configuration = - configurations.resolvable(CONFIGURATION_NAME) { + configurations.dependencyScope(CONFIGURATION_NAME) { description = "R8 dependencies for Keeper. This is used solely for the TraceReferences CLI" isVisible = false defaultDependencies {