diff options
| author | Jiaxiang Chen <jiaxiang@google.com> | 2022-05-10 22:24:59 -0700 |
|---|---|---|
| committer | Jiaxiang Chen <roaringacw@gmail.com> | 2022-05-11 12:57:40 -0700 |
| commit | f56de794c956e42f201466de7b23166a66bd1f89 (patch) | |
| tree | d38c7a5bb7ca9bc31cf0e959639be1fed9844eac /gradle-plugin | |
| parent | 089f0f752d19f87be742a1d061e7ef79e91beaaa (diff) | |
| download | ksp-f56de794c956e42f201466de7b23166a66bd1f89.tar.gz | |
UPDATE_KOTLIN_VERSION: 1.7.20-dev-984
Diffstat (limited to 'gradle-plugin')
| -rw-r--r-- | gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt index 363ea3b2..826f3ea3 100644 --- a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt +++ b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt @@ -78,10 +78,10 @@ internal class Configurator : AbstractKotlinCompileConfig<AbstractKotlinCompile< constructor(compilation: KotlinCompilationData<*>, kotlinCompile: AbstractKotlinCompile<*>) : super(compilation) { configureTask { task -> if (task is KspTaskJvm) { - // Assign moduleName different from kotlin compilation to + // Assign ownModuleName different from kotlin compilation to // work around https://github.com/google/ksp/issues/647 // This will not be necessary once https://youtrack.jetbrains.com/issue/KT-45777 lands - task.moduleName.value(kotlinCompile.moduleName.map { "$it-ksp" }) + task.ownModuleName.value(kotlinCompile.ownModuleName.map { "$it-ksp" }) } if (task is KspTaskJS) { val libraryCacheService = project.rootProject.gradle.sharedServices.registerIfAbsent( @@ -626,13 +626,13 @@ abstract class KspTaskJvm @Inject constructor( args.addPluginOptions(options.get()) args.destinationAsFile = destination args.allowNoSourceFiles = true - args.useFir = false + args.useK2 = false } // Overrding an internal function is hacky. // TODO: Ask upstream to open it. @Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "EXPOSED_PARAMETER_TYPE") - fun `callCompilerAsync$kotlin_gradle_plugin`( + fun `callCompilerAsync$kotlin_gradle_plugin_common`( args: K2JVMCompilerArguments, kotlinSources: Set<File>, inputChanges: InputChanges, @@ -745,13 +745,13 @@ abstract class KspTaskJS @Inject constructor( args.addPluginOptions(options.get()) args.outputFile = File(destination, "dummyOutput.js").canonicalPath kotlinOptions.copyFreeCompilerArgsToArgs(args) - args.useFir = false + args.useK2 = false } // Overrding an internal function is hacky. // TODO: Ask upstream to open it. @Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "EXPOSED_PARAMETER_TYPE") - fun `callCompilerAsync$kotlin_gradle_plugin`( + fun `callCompilerAsync$kotlin_gradle_plugin_common`( args: K2JSCompilerArguments, kotlinSources: Set<File>, inputChanges: InputChanges, @@ -769,7 +769,7 @@ abstract class KspTaskJS @Inject constructor( // Overrding an internal function is hacky. // TODO: Ask upstream to open it. @Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "EXPOSED_PARAMETER_TYPE") - fun `isIncrementalCompilationEnabled$kotlin_gradle_plugin`(): Boolean = false + fun `isIncrementalCompilationEnabled$kotlin_gradle_plugin_common`(): Boolean = false @get:InputFiles @get:SkipWhenEmpty @@ -833,13 +833,13 @@ abstract class KspTaskMetadata @Inject constructor( args.friendPaths = friendPaths.files.map { it.absolutePath }.toTypedArray() args.refinesPaths = refinesMetadataPaths.map { it.absolutePath }.toTypedArray() args.expectActualLinker = true - args.useFir = false + args.useK2 = false } // Overrding an internal function is hacky. // TODO: Ask upstream to open it. @Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "EXPOSED_PARAMETER_TYPE") - fun `callCompilerAsync$kotlin_gradle_plugin`( + fun `callCompilerAsync$kotlin_gradle_plugin_common`( args: K2MetadataCompilerArguments, kotlinSources: Set<File>, inputChanges: InputChanges, |