diff --git a/.gitignore b/.gitignore index d135c67..a4b6cc1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea/* +!.idea/externalDependencies.xml !.idea/kotlinTestDataPluginTestDataPaths.xml .gradle/ .kotlin/ diff --git a/.idea/externalDependencies.xml b/.idea/externalDependencies.xml new file mode 100644 index 0000000..b1e4cf4 --- /dev/null +++ b/.idea/externalDependencies.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/README.md b/README.md index 45cfa0f..6bac36e 100644 --- a/README.md +++ b/README.md @@ -22,10 +22,10 @@ To create a new test, add a new `.kt` file in a [compiler-plugin/testData](compi `testData/box` for codegen tests and `testData/diagnostics` for diagnostics tests. The generated JUnit 5 test classes will be updated automatically when tests are next run. They can be manually updated with the `generateTests` Gradle task as well. -To aid in running tests, it is recommended to install the [Kotlin Test Data Helper][test-plugin] IntelliJ plugin, +To aid in running tests, it is recommended to install the [Kotlin Compiler DevKit][test-plugin] IntelliJ plugin, which is pre-configured in this repository. [//]: # (Links) [test-framework]: https://github.com/JetBrains/kotlin/blob/2.1.20/compiler/test-infrastructure/ReadMe.md -[test-plugin]: https://github.com/demiurg906/test-data-helper-plugin +[test-plugin]: https://github.com/JetBrains/kotlin-compiler-devkit diff --git a/build.gradle.kts b/build.gradle.kts index c6e425d..1201017 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,6 +6,6 @@ plugins { } allprojects { - group = "org.demiurg906.kotlin.plugin" + group = "org.jetbrains.kotlin.compiler.plugin.template" version = "0.1.0-SNAPSHOT" } diff --git a/compiler-plugin/build.gradle.kts b/compiler-plugin/build.gradle.kts index 63081bc..084868c 100644 --- a/compiler-plugin/build.gradle.kts +++ b/compiler-plugin/build.gradle.kts @@ -86,7 +86,7 @@ val generateTests by tasks.registering(JavaExec::class) { .withPropertyName("generatedTests") classpath = sourceSets.testFixtures.get().runtimeClasspath - mainClass.set("org.demiurg906.kotlin.plugin.GenerateTestsKt") + mainClass.set("org.jetbrains.kotlin.compiler.plugin.template.GenerateTestsKt") workingDir = rootDir } diff --git a/compiler-plugin/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor b/compiler-plugin/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor index b9b2307..82a00fa 100644 --- a/compiler-plugin/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor +++ b/compiler-plugin/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor @@ -1 +1 @@ -org.demiurg906.kotlin.plugin.SimpleCommandLineProcessor +org.jetbrains.kotlin.compiler.plugin.template.SimpleCommandLineProcessor diff --git a/compiler-plugin/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar b/compiler-plugin/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar index c23e37f..8384a4e 100644 --- a/compiler-plugin/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar +++ b/compiler-plugin/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar @@ -1 +1 @@ -org.demiurg906.kotlin.plugin.SimplePluginComponentRegistrar +org.jetbrains.kotlin.compiler.plugin.template.SimplePluginComponentRegistrar diff --git a/compiler-plugin/src/org/demiurg906/kotlin/plugin/SimpleCommandLineProcessor.kt b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleCommandLineProcessor.kt similarity index 92% rename from compiler-plugin/src/org/demiurg906/kotlin/plugin/SimpleCommandLineProcessor.kt rename to compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleCommandLineProcessor.kt index 35b4bf2..e6ba9b7 100644 --- a/compiler-plugin/src/org/demiurg906/kotlin/plugin/SimpleCommandLineProcessor.kt +++ b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleCommandLineProcessor.kt @@ -1,4 +1,4 @@ -package org.demiurg906.kotlin.plugin +package org.jetbrains.kotlin.compiler.plugin.template import org.jetbrains.kotlin.compiler.plugin.AbstractCliOption import org.jetbrains.kotlin.compiler.plugin.CliOption diff --git a/compiler-plugin/src/org/demiurg906/kotlin/plugin/SimplePluginComponentRegistrar.kt b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimplePluginComponentRegistrar.kt similarity index 82% rename from compiler-plugin/src/org/demiurg906/kotlin/plugin/SimplePluginComponentRegistrar.kt rename to compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimplePluginComponentRegistrar.kt index 5134130..913adc2 100644 --- a/compiler-plugin/src/org/demiurg906/kotlin/plugin/SimplePluginComponentRegistrar.kt +++ b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimplePluginComponentRegistrar.kt @@ -1,10 +1,10 @@ -package org.demiurg906.kotlin.plugin +package org.jetbrains.kotlin.compiler.plugin.template import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar +import org.jetbrains.kotlin.compiler.plugin.template.ir.SimpleIrGenerationExtension import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter -import org.demiurg906.kotlin.plugin.ir.SimpleIrGenerationExtension class SimplePluginComponentRegistrar: CompilerPluginRegistrar() { override val supportsK2: Boolean diff --git a/compiler-plugin/src/org/demiurg906/kotlin/plugin/SimplePluginRegistrar.kt b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimplePluginRegistrar.kt similarity index 63% rename from compiler-plugin/src/org/demiurg906/kotlin/plugin/SimplePluginRegistrar.kt rename to compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimplePluginRegistrar.kt index c2cf6e8..8caa9bb 100644 --- a/compiler-plugin/src/org/demiurg906/kotlin/plugin/SimplePluginRegistrar.kt +++ b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimplePluginRegistrar.kt @@ -1,7 +1,7 @@ -package org.demiurg906.kotlin.plugin +package org.jetbrains.kotlin.compiler.plugin.template +import org.jetbrains.kotlin.compiler.plugin.template.fir.SimpleClassGenerator import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar -import org.demiurg906.kotlin.plugin.fir.SimpleClassGenerator class SimplePluginRegistrar : FirExtensionRegistrar() { override fun ExtensionRegistrarContext.configurePlugin() { diff --git a/compiler-plugin/src/org/demiurg906/kotlin/plugin/fir/SimpleClassGenerator.kt b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/fir/SimpleClassGenerator.kt similarity index 98% rename from compiler-plugin/src/org/demiurg906/kotlin/plugin/fir/SimpleClassGenerator.kt rename to compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/fir/SimpleClassGenerator.kt index 7ba9762..575229d 100644 --- a/compiler-plugin/src/org/demiurg906/kotlin/plugin/fir/SimpleClassGenerator.kt +++ b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/fir/SimpleClassGenerator.kt @@ -1,4 +1,4 @@ -package org.demiurg906.kotlin.plugin.fir +package org.jetbrains.kotlin.compiler.plugin.template.fir import org.jetbrains.kotlin.GeneratedDeclarationKey import org.jetbrains.kotlin.fir.FirSession diff --git a/compiler-plugin/src/org/demiurg906/kotlin/plugin/ir/AbstractTransformerForGenerator.kt b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/ir/AbstractTransformerForGenerator.kt similarity index 98% rename from compiler-plugin/src/org/demiurg906/kotlin/plugin/ir/AbstractTransformerForGenerator.kt rename to compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/ir/AbstractTransformerForGenerator.kt index 8950e29..626fda9 100644 --- a/compiler-plugin/src/org/demiurg906/kotlin/plugin/ir/AbstractTransformerForGenerator.kt +++ b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/ir/AbstractTransformerForGenerator.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.demiurg906.kotlin.plugin.ir +package org.jetbrains.kotlin.compiler.plugin.template.ir import org.jetbrains.kotlin.GeneratedDeclarationKey import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext diff --git a/compiler-plugin/src/org/demiurg906/kotlin/plugin/ir/SimpleIrBodyGenerator.kt b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/ir/SimpleIrBodyGenerator.kt similarity index 91% rename from compiler-plugin/src/org/demiurg906/kotlin/plugin/ir/SimpleIrBodyGenerator.kt rename to compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/ir/SimpleIrBodyGenerator.kt index 61a2933..3bf1067 100644 --- a/compiler-plugin/src/org/demiurg906/kotlin/plugin/ir/SimpleIrBodyGenerator.kt +++ b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/ir/SimpleIrBodyGenerator.kt @@ -1,15 +1,15 @@ -package org.demiurg906.kotlin.plugin.ir +package org.jetbrains.kotlin.compiler.plugin.template.ir import org.jetbrains.kotlin.GeneratedDeclarationKey import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext +import org.jetbrains.kotlin.compiler.plugin.template.fir.SimpleClassGenerator import org.jetbrains.kotlin.ir.declarations.IrConstructor import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction +import org.jetbrains.kotlin.ir.declarations.createBlockBody import org.jetbrains.kotlin.ir.expressions.IrBody import org.jetbrains.kotlin.ir.expressions.IrConstKind import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl import org.jetbrains.kotlin.ir.expressions.impl.IrReturnImpl -import org.demiurg906.kotlin.plugin.fir.SimpleClassGenerator -import org.jetbrains.kotlin.ir.declarations.createBlockBody class SimpleIrBodyGenerator(pluginContext: IrPluginContext) : AbstractTransformerForGenerator(pluginContext) { override fun interestedIn(key: GeneratedDeclarationKey?): Boolean { diff --git a/compiler-plugin/src/org/demiurg906/kotlin/plugin/ir/SimpleIrGenerationExtension.kt b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/ir/SimpleIrGenerationExtension.kt similarity index 91% rename from compiler-plugin/src/org/demiurg906/kotlin/plugin/ir/SimpleIrGenerationExtension.kt rename to compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/ir/SimpleIrGenerationExtension.kt index c95e1ee..521fd3f 100644 --- a/compiler-plugin/src/org/demiurg906/kotlin/plugin/ir/SimpleIrGenerationExtension.kt +++ b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/ir/SimpleIrGenerationExtension.kt @@ -1,4 +1,4 @@ -package org.demiurg906.kotlin.plugin.ir +package org.jetbrains.kotlin.compiler.plugin.template.ir import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext diff --git a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/GenerateTests.kt b/compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/GenerateTests.kt similarity index 66% rename from compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/GenerateTests.kt rename to compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/GenerateTests.kt index 3cedc09..66d7096 100644 --- a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/GenerateTests.kt +++ b/compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/GenerateTests.kt @@ -1,8 +1,8 @@ -package org.demiurg906.kotlin.plugin +package org.jetbrains.kotlin.compiler.plugin.template +import org.jetbrains.kotlin.compiler.plugin.template.runners.AbstractJvmBoxTest +import org.jetbrains.kotlin.compiler.plugin.template.runners.AbstractJvmDiagnosticTest import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5 -import org.demiurg906.kotlin.plugin.runners.AbstractJvmBoxTest -import org.demiurg906.kotlin.plugin.runners.AbstractJvmDiagnosticTest fun main() { generateTestGroupSuiteWithJUnit5 { diff --git a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractJvmBoxTest.kt b/compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/runners/AbstractJvmBoxTest.kt similarity index 88% rename from compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractJvmBoxTest.kt rename to compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/runners/AbstractJvmBoxTest.kt index fa15e7a..e00158c 100644 --- a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractJvmBoxTest.kt +++ b/compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/runners/AbstractJvmBoxTest.kt @@ -1,7 +1,7 @@ -package org.demiurg906.kotlin.plugin.runners +package org.jetbrains.kotlin.compiler.plugin.template.runners -import org.demiurg906.kotlin.plugin.services.ExtensionRegistrarConfigurator -import org.demiurg906.kotlin.plugin.services.PluginAnnotationsProvider +import org.jetbrains.kotlin.compiler.plugin.template.services.ExtensionRegistrarConfigurator +import org.jetbrains.kotlin.compiler.plugin.template.services.PluginAnnotationsProvider import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.directives.CodegenTestDirectives diff --git a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractJvmDiagnosticTest.kt b/compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/runners/AbstractJvmDiagnosticTest.kt similarity index 87% rename from compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractJvmDiagnosticTest.kt rename to compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/runners/AbstractJvmDiagnosticTest.kt index c520595..40bbdc7 100644 --- a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/runners/AbstractJvmDiagnosticTest.kt +++ b/compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/runners/AbstractJvmDiagnosticTest.kt @@ -1,7 +1,7 @@ -package org.demiurg906.kotlin.plugin.runners +package org.jetbrains.kotlin.compiler.plugin.template.runners -import org.demiurg906.kotlin.plugin.services.ExtensionRegistrarConfigurator -import org.demiurg906.kotlin.plugin.services.PluginAnnotationsProvider +import org.jetbrains.kotlin.compiler.plugin.template.services.ExtensionRegistrarConfigurator +import org.jetbrains.kotlin.compiler.plugin.template.services.PluginAnnotationsProvider import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.directives.CodegenTestDirectives diff --git a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/services/ExtensionRegistrarConfigurator.kt b/compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/services/ExtensionRegistrarConfigurator.kt similarity index 79% rename from compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/services/ExtensionRegistrarConfigurator.kt rename to compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/services/ExtensionRegistrarConfigurator.kt index 515a013..4bb5bc1 100644 --- a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/services/ExtensionRegistrarConfigurator.kt +++ b/compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/services/ExtensionRegistrarConfigurator.kt @@ -1,14 +1,14 @@ -package org.demiurg906.kotlin.plugin.services +package org.jetbrains.kotlin.compiler.plugin.template.services import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar +import org.jetbrains.kotlin.compiler.plugin.template.SimplePluginRegistrar +import org.jetbrains.kotlin.compiler.plugin.template.ir.SimpleIrGenerationExtension import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.EnvironmentConfigurator import org.jetbrains.kotlin.test.services.TestServices -import org.demiurg906.kotlin.plugin.SimplePluginRegistrar -import org.demiurg906.kotlin.plugin.ir.SimpleIrGenerationExtension class ExtensionRegistrarConfigurator(testServices: TestServices) : EnvironmentConfigurator(testServices) { override fun CompilerPluginRegistrar.ExtensionStorage.registerCompilerExtensions( diff --git a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/services/PluginAnnotationsProvider.kt b/compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/services/PluginAnnotationsProvider.kt similarity index 93% rename from compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/services/PluginAnnotationsProvider.kt rename to compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/services/PluginAnnotationsProvider.kt index 92a134f..0f6e080 100644 --- a/compiler-plugin/test-fixtures/org/demiurg906/kotlin/plugin/services/PluginAnnotationsProvider.kt +++ b/compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/services/PluginAnnotationsProvider.kt @@ -1,4 +1,4 @@ -package org.demiurg906.kotlin.plugin.services +package org.jetbrains.kotlin.compiler.plugin.template.services import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot import org.jetbrains.kotlin.config.CompilerConfiguration diff --git a/compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/JvmBoxTestGenerated.java b/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmBoxTestGenerated.java similarity index 83% rename from compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/JvmBoxTestGenerated.java rename to compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmBoxTestGenerated.java index 2cd1eae..b20c218 100644 --- a/compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/JvmBoxTestGenerated.java +++ b/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmBoxTestGenerated.java @@ -1,6 +1,6 @@ -package org.demiurg906.kotlin.plugin.runners; +package org.jetbrains.kotlin.compiler.plugin.template.runners; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -11,7 +11,7 @@ import java.io.File; import java.util.regex.Pattern; -/** This class is generated by {@link org.demiurg906.kotlin.plugin.GenerateTestsKt}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.kotlin.compiler.plugin.template.GenerateTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @TestMetadata("compiler-plugin/testData/box") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/JvmDiagnosticTestGenerated.java b/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmDiagnosticTestGenerated.java similarity index 84% rename from compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/JvmDiagnosticTestGenerated.java rename to compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmDiagnosticTestGenerated.java index 6661df8..2de866d 100644 --- a/compiler-plugin/test-gen/org/demiurg906/kotlin/plugin/runners/JvmDiagnosticTestGenerated.java +++ b/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmDiagnosticTestGenerated.java @@ -1,6 +1,6 @@ -package org.demiurg906.kotlin.plugin.runners; +package org.jetbrains.kotlin.compiler.plugin.template.runners; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; @@ -11,7 +11,7 @@ import java.io.File; import java.util.regex.Pattern; -/** This class is generated by {@link org.demiurg906.kotlin.plugin.GenerateTestsKt}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.kotlin.compiler.plugin.template.GenerateTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @TestMetadata("compiler-plugin/testData/diagnostics") @TestDataPath("$PROJECT_ROOT") diff --git a/compiler-plugin/testData/box/anotherBoxTest.fir.ir.txt b/compiler-plugin/testData/box/anotherBoxTest.fir.ir.txt index 24a7838..9b17602 100644 --- a/compiler-plugin/testData/box/anotherBoxTest.fir.ir.txt +++ b/compiler-plugin/testData/box/anotherBoxTest.fir.ir.txt @@ -34,12 +34,12 @@ FILE fqName: fileName:/anotherBoxTest.kt CONST String type=kotlin.String value="Fail: " GET_VAR 'val result: kotlin.Int declared in .box' type=kotlin.Int origin=null FILE fqName:foo.bar fileName:__GENERATED DECLARATIONS__.kt - CLASS GENERATED[org.demiurg906.kotlin.plugin.fir.SimpleClassGenerator.Key] CLASS name:MyClass modality:FINAL visibility:public superTypes:[kotlin.Any] + CLASS GENERATED[org.jetbrains.kotlin.compiler.plugin.template.fir.SimpleClassGenerator.Key] CLASS name:MyClass modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:foo.bar.MyClass - CONSTRUCTOR GENERATED[org.demiurg906.kotlin.plugin.fir.SimpleClassGenerator.Key] visibility:public <> () returnType:foo.bar.MyClass + CONSTRUCTOR GENERATED[org.jetbrains.kotlin.compiler.plugin.template.fir.SimpleClassGenerator.Key] visibility:public <> () returnType:foo.bar.MyClass BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS GENERATED[org.demiurg906.kotlin.plugin.fir.SimpleClassGenerator.Key] CLASS name:MyClass modality:FINAL visibility:public superTypes:[kotlin.Any]' type=foo.bar.MyClass + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS GENERATED[org.jetbrains.kotlin.compiler.plugin.template.fir.SimpleClassGenerator.Key] CLASS name:MyClass modality:FINAL visibility:public superTypes:[kotlin.Any]' type=foo.bar.MyClass FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any @@ -53,7 +53,7 @@ FILE fqName:foo.bar fileName:__GENERATED DECLARATIONS__.kt overridden: public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any - FUN GENERATED[org.demiurg906.kotlin.plugin.fir.SimpleClassGenerator.Key] name:foo visibility:public modality:FINAL <> ($this:foo.bar.MyClass) returnType:kotlin.String + FUN GENERATED[org.jetbrains.kotlin.compiler.plugin.template.fir.SimpleClassGenerator.Key] name:foo visibility:public modality:FINAL <> ($this:foo.bar.MyClass) returnType:kotlin.String $this: VALUE_PARAMETER name: type:foo.bar.MyClass BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String declared in foo.bar.MyClass' diff --git a/compiler-plugin/testData/box/simple.fir.ir.txt b/compiler-plugin/testData/box/simple.fir.ir.txt index ca55586..43a098e 100644 --- a/compiler-plugin/testData/box/simple.fir.ir.txt +++ b/compiler-plugin/testData/box/simple.fir.ir.txt @@ -19,12 +19,12 @@ FILE fqName:foo.bar fileName:/simple.kt CONST String type=kotlin.String value="Fail: " GET_VAR 'val result: kotlin.String declared in foo.bar.box' type=kotlin.String origin=null FILE fqName:foo.bar fileName:__GENERATED DECLARATIONS__.kt - CLASS GENERATED[org.demiurg906.kotlin.plugin.fir.SimpleClassGenerator.Key] CLASS name:MyClass modality:FINAL visibility:public superTypes:[kotlin.Any] + CLASS GENERATED[org.jetbrains.kotlin.compiler.plugin.template.fir.SimpleClassGenerator.Key] CLASS name:MyClass modality:FINAL visibility:public superTypes:[kotlin.Any] $this: VALUE_PARAMETER INSTANCE_RECEIVER name: type:foo.bar.MyClass - CONSTRUCTOR GENERATED[org.demiurg906.kotlin.plugin.fir.SimpleClassGenerator.Key] visibility:public <> () returnType:foo.bar.MyClass + CONSTRUCTOR GENERATED[org.jetbrains.kotlin.compiler.plugin.template.fir.SimpleClassGenerator.Key] visibility:public <> () returnType:foo.bar.MyClass BLOCK_BODY DELEGATING_CONSTRUCTOR_CALL 'public constructor () declared in kotlin.Any' - INSTANCE_INITIALIZER_CALL classDescriptor='CLASS GENERATED[org.demiurg906.kotlin.plugin.fir.SimpleClassGenerator.Key] CLASS name:MyClass modality:FINAL visibility:public superTypes:[kotlin.Any]' type=foo.bar.MyClass + INSTANCE_INITIALIZER_CALL classDescriptor='CLASS GENERATED[org.jetbrains.kotlin.compiler.plugin.template.fir.SimpleClassGenerator.Key] CLASS name:MyClass modality:FINAL visibility:public superTypes:[kotlin.Any]' type=foo.bar.MyClass FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean [fake_override,operator] overridden: public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any @@ -38,7 +38,7 @@ FILE fqName:foo.bar fileName:__GENERATED DECLARATIONS__.kt overridden: public open fun toString (): kotlin.String declared in kotlin.Any $this: VALUE_PARAMETER name: type:kotlin.Any - FUN GENERATED[org.demiurg906.kotlin.plugin.fir.SimpleClassGenerator.Key] name:foo visibility:public modality:FINAL <> ($this:foo.bar.MyClass) returnType:kotlin.String + FUN GENERATED[org.jetbrains.kotlin.compiler.plugin.template.fir.SimpleClassGenerator.Key] name:foo visibility:public modality:FINAL <> ($this:foo.bar.MyClass) returnType:kotlin.String $this: VALUE_PARAMETER name: type:foo.bar.MyClass BLOCK_BODY RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.String declared in foo.bar.MyClass' diff --git a/compiler-plugin/testData/diagnostics/simple.fir.txt b/compiler-plugin/testData/diagnostics/simple.fir.txt index 6d75942..074a97b 100644 --- a/compiler-plugin/testData/diagnostics/simple.fir.txt +++ b/compiler-plugin/testData/diagnostics/simple.fir.txt @@ -1,7 +1,7 @@ FILE: simple.kt package foo.bar - @R|org/demiurg906/kotlin/plugin/SomeAnnotation|() public final fun test(): R|kotlin/Unit| { + @R|org/jetbrains/kotlin/compiler/plugin/template/SomeAnnotation|() public final fun test(): R|kotlin/Unit| { lval s: R|kotlin/String| = R|foo/bar/MyClass|().R|foo/bar/MyClass.foo|() R|/s|.#() } diff --git a/compiler-plugin/testData/diagnostics/simple.kt b/compiler-plugin/testData/diagnostics/simple.kt index 224ef5e..2f27802 100644 --- a/compiler-plugin/testData/diagnostics/simple.kt +++ b/compiler-plugin/testData/diagnostics/simple.kt @@ -2,7 +2,7 @@ package foo.bar -import org.demiurg906.kotlin.plugin.SomeAnnotation +import org.jetbrains.kotlin.compiler.plugin.template.SomeAnnotation @SomeAnnotation fun test() { diff --git a/gradle-plugin/src/org/demiurg906/kotlin/plugin/SimpleGradleExtension.kt b/gradle-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleGradleExtension.kt similarity index 67% rename from gradle-plugin/src/org/demiurg906/kotlin/plugin/SimpleGradleExtension.kt rename to gradle-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleGradleExtension.kt index 10071e7..2f7aca7 100644 --- a/gradle-plugin/src/org/demiurg906/kotlin/plugin/SimpleGradleExtension.kt +++ b/gradle-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleGradleExtension.kt @@ -1,4 +1,4 @@ -package org.demiurg906.kotlin.plugin +package org.jetbrains.kotlin.compiler.plugin.template import org.gradle.api.model.ObjectFactory diff --git a/gradle-plugin/src/org/demiurg906/kotlin/plugin/SimpleGradlePlugin.kt b/gradle-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleGradlePlugin.kt similarity index 91% rename from gradle-plugin/src/org/demiurg906/kotlin/plugin/SimpleGradlePlugin.kt rename to gradle-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleGradlePlugin.kt index 3ae1a81..d5af458 100644 --- a/gradle-plugin/src/org/demiurg906/kotlin/plugin/SimpleGradlePlugin.kt +++ b/gradle-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleGradlePlugin.kt @@ -1,8 +1,8 @@ -package org.demiurg906.kotlin.plugin +package org.jetbrains.kotlin.compiler.plugin.template -import org.demiurg906.kotlin.plugin.BuildConfig.ANNOTATIONS_LIBRARY_COORDINATES import org.gradle.api.Project import org.gradle.api.provider.Provider +import org.jetbrains.kotlin.compiler.plugin.template.BuildConfig.ANNOTATIONS_LIBRARY_COORDINATES import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerPluginSupportPlugin import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact diff --git a/plugin-annotations/api/plugin-annotations.api b/plugin-annotations/api/plugin-annotations.api index 1af8dbd..fa72fb2 100644 --- a/plugin-annotations/api/plugin-annotations.api +++ b/plugin-annotations/api/plugin-annotations.api @@ -1,3 +1,3 @@ -public abstract interface annotation class org/demiurg906/kotlin/plugin/SomeAnnotation : java/lang/annotation/Annotation { +public abstract interface annotation class org/jetbrains/kotlin/compiler/plugin/template/SomeAnnotation : java/lang/annotation/Annotation { } diff --git a/plugin-annotations/src/commonMain/kotlin/org/demiurg906/kotlin/plugin/SomeAnnotation.kt b/plugin-annotations/src/commonMain/kotlin/org/demiurg906/kotlin/plugin/SomeAnnotation.kt deleted file mode 100644 index 6a073e8..0000000 --- a/plugin-annotations/src/commonMain/kotlin/org/demiurg906/kotlin/plugin/SomeAnnotation.kt +++ /dev/null @@ -1,3 +0,0 @@ -package org.demiurg906.kotlin.plugin - -public annotation class SomeAnnotation diff --git a/plugin-annotations/src/commonMain/kotlin/org/jetbrains/kotlin/compiler/plugin/template/SomeAnnotation.kt b/plugin-annotations/src/commonMain/kotlin/org/jetbrains/kotlin/compiler/plugin/template/SomeAnnotation.kt new file mode 100644 index 0000000..b82a779 --- /dev/null +++ b/plugin-annotations/src/commonMain/kotlin/org/jetbrains/kotlin/compiler/plugin/template/SomeAnnotation.kt @@ -0,0 +1,3 @@ +package org.jetbrains.kotlin.compiler.plugin.template + +public annotation class SomeAnnotation diff --git a/settings.gradle.kts b/settings.gradle.kts index 5551392..0f2168a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,7 +2,6 @@ pluginManagement { repositories { mavenCentral() gradlePluginPortal() - maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap") } } @@ -10,11 +9,10 @@ pluginManagement { dependencyResolutionManagement { repositories { mavenCentral() - maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap") } } -rootProject.name = "kotlin-compiler-plugin-template" +rootProject.name = "compiler-plugin-template" include("compiler-plugin") include("gradle-plugin")