diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5eab4fa08..fd5ccca74 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ antlr-shadowed = "4.10.1.6" asm-relocated = "9.6.0.1" caffeine = "3.1.8" commons-io = "2.16.0" -dagp = "1.31.0" +dagp = "1.33.0" error-prone = "2.26.1" gradle-publish-plugin = "1.1.0" grammar = "0.3" diff --git a/src/main/kotlin/com/autonomousapps/subplugin/ProjectPlugin.kt b/src/main/kotlin/com/autonomousapps/subplugin/ProjectPlugin.kt index 6fa016d8b..6f948c72e 100644 --- a/src/main/kotlin/com/autonomousapps/subplugin/ProjectPlugin.kt +++ b/src/main/kotlin/com/autonomousapps/subplugin/ProjectPlugin.kt @@ -721,7 +721,7 @@ internal class ProjectPlugin(private val project: Project) { } // Find the inline members of this project's dependencies. - val kotlinMagicTask = tasks.register("findInlineMembers$taskNameSuffix") { + val kotlinMagicTask = tasks.register("findKotlinMagic$taskNameSuffix") { inMemoryCacheProvider.set(InMemoryCache.register(project)) compileClasspath.setFrom( configurations[dependencyAnalyzer.compileConfigurationName] diff --git a/src/main/kotlin/com/autonomousapps/tasks/FindInlineMembersTask.kt b/src/main/kotlin/com/autonomousapps/tasks/FindKotlinMagicTask.kt similarity index 96% rename from src/main/kotlin/com/autonomousapps/tasks/FindInlineMembersTask.kt rename to src/main/kotlin/com/autonomousapps/tasks/FindKotlinMagicTask.kt index 2b1747387..169c6461e 100644 --- a/src/main/kotlin/com/autonomousapps/tasks/FindInlineMembersTask.kt +++ b/src/main/kotlin/com/autonomousapps/tasks/FindKotlinMagicTask.kt @@ -29,9 +29,8 @@ import java.io.File import java.util.zip.ZipFile import javax.inject.Inject -// TODO(2.0): rename this task to FindKotlinMagicTask @CacheableTask -abstract class FindInlineMembersTask @Inject constructor( +abstract class FindKotlinMagicTask @Inject constructor( private val workerExecutor: WorkerExecutor, ) : DefaultTask() { @@ -71,11 +70,11 @@ abstract class FindInlineMembersTask @Inject constructor( @TaskAction fun action() { workerExecutor.noIsolation().submit(FindKotlinMagicWorkAction::class.java) { - artifacts.set(this@FindInlineMembersTask.artifacts) - inlineUsageReport.set(this@FindInlineMembersTask.outputInlineMembers) - typealiasReport.set(this@FindInlineMembersTask.outputTypealiases) - errorsReport.set(this@FindInlineMembersTask.outputErrors) - inMemoryCacheProvider.set(this@FindInlineMembersTask.inMemoryCacheProvider) + artifacts.set(this@FindKotlinMagicTask.artifacts) + inlineUsageReport.set(this@FindKotlinMagicTask.outputInlineMembers) + typealiasReport.set(this@FindKotlinMagicTask.outputTypealiases) + errorsReport.set(this@FindKotlinMagicTask.outputErrors) + inMemoryCacheProvider.set(this@FindKotlinMagicTask.inMemoryCacheProvider) } } @@ -89,7 +88,7 @@ abstract class FindInlineMembersTask @Inject constructor( abstract class FindKotlinMagicWorkAction : WorkAction { - private val logger = getLogger() + private val logger = getLogger() override fun execute() { val inlineUsageReportFile = parameters.inlineUsageReport.getAndDelete() @@ -123,7 +122,7 @@ internal class KotlinMagicFinder( private val errorsReport: File, ) { - private val logger = getLogger() + private val logger = getLogger() var didWriteErrors = false val inlineMembers: Set