build 1.1.0 for kotlin 1.7.21

sergeshustoff · Apr 29, 2023 · 0b278ca · 0b278ca
1 parent ecfaa97
commit 0b278ca
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
diff --git a/...is/src/main/kotlin/dev/shustoff/dikt/compiler/DiktStorageComponentContainerContributor.kt b/...is/src/main/kotlin/dev/shustoff/dikt/compiler/DiktStorageComponentContainerContributor.kt
@@ -14,7 +14,6 @@ class DiktStorageComponentContainerContributor : StorageComponentContainerContri
         platform: TargetPlatform,
         moduleDescriptor: ModuleDescriptor
     ) {
-        super.registerModuleComponents(container, platform, moduleDescriptor)
         container.useInstance(DiktPlatformDiagnosticSuppressor())
         container.useClashResolver(PlatformDiagnosticSuppressorClashesResolver())
     }

diff --git a/dikt-compiler-plugin/src/main/kotlin/dev/shustoff/dikt/compiler/DiktComponentRegistrar.kt b/dikt-compiler-plugin/src/main/kotlin/dev/shustoff/dikt/compiler/DiktComponentRegistrar.kt
@@ -3,19 +3,17 @@ package dev.shustoff.dikt.compiler
 import dev.shustoff.dikt.incremental.incrementalHelper
 import dev.shustoff.dikt.message_collector.errorCollector
 import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
-import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
-import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
+import org.jetbrains.kotlin.com.intellij.mock.MockProject
+import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
 
-@OptIn(ExperimentalCompilerApi::class)
-class DiktComponentRegistrar : CompilerPluginRegistrar() {
-    override val supportsK2: Boolean get() = true
+class DiktComponentRegistrar : ComponentRegistrar {
 
-    override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {
+    override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
         val errorCollector = errorCollector(configuration)
         val incrementalCache = incrementalHelper(configuration)
-        StorageComponentContainerContributor.registerExtension(DiktStorageComponentContainerContributor())
-        IrGenerationExtension.registerExtension(DiktIrGenerationExtension(errorCollector, incrementalCache))
+        StorageComponentContainerContributor.registerExtension(project, DiktStorageComponentContainerContributor())
+        IrGenerationExtension.registerExtension(project, DiktIrGenerationExtension(errorCollector, incrementalCache))
     }
 }
diff --git a/...n.compiler.plugin.CompilerPluginRegistrar → ...kotlin.compiler.plugin.ComponentRegistrar b/...n.compiler.plugin.CompilerPluginRegistrar → ...kotlin.compiler.plugin.ComponentRegistrar
diff --git a/dikt-compiler-plugin/src/test/kotlin/dev/shustoff/dikt/compiler/CompileExt.kt b/dikt-compiler-plugin/src/test/kotlin/dev/shustoff/dikt/compiler/CompileExt.kt
@@ -20,12 +20,12 @@ fun compile(root: File, vararg sourceFiles: SourceFile): KotlinCompilation.Resul
         workingDir = root
         //TODO: uncomment when fixed
 //        compilerPluginRegistrars = listOf(DiktComponentRegistrar())
-        componentRegistrars = listOf(DiktComponentRegistrarLegacy())
+        componentRegistrars = listOf(DiktComponentRegistrar())
         inheritClassPath = true
         sources = sourceFiles.asList()
         verbose = false
         useIR = true
-//        jvmTarget = JvmTarget.JVM_1_8.description
+        jvmTarget = JvmTarget.JVM_1_8.description
     }.compile()
 }
 

diff --git a/dikt-gradle-plugin/src/main/kotlin/dev/shustoff/dikt/gradle/DiktGradlePlugin.kt b/dikt-gradle-plugin/src/main/kotlin/dev/shustoff/dikt/gradle/DiktGradlePlugin.kt
@@ -38,7 +38,7 @@ class DiktGradlePlugin : KotlinCompilerPluginSupportPlugin {
     }
 
     companion object {
-        private const val version = "1.1.0-kotlin-1.8.10"
+        private const val version = "1.1.0-kotlin-1.7.21"
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -5,10 +5,10 @@ kotlin.js.webpack.major.version=5
 kotlin.compiler.execution.strategy=in-process
 org.gradle.jvmargs=-Xmx3g
 
-kotlin_version=1.8.10
+kotlin_version=1.7.21
 
 # don't forget to update DiktGradlePlugin
-VERSION_NAME=1.1.0-kotlin-1.8.10
+VERSION_NAME=1.1.0-kotlin-1.7.21
 dikt_sample_version=1.1.0-alpha6
 
 GROUP=io.github.sergeshustoff.dikt