update to Kotlin 1.4.30

Author: Foso

build.gradle

@@ -2,7 +2,6 @@ buildscript {
 
     ext.buildMaven = { p -> repositories { maven { url p } } }
 
-
     repositories {
         mavenLocal()
         google()
@@ -12,14 +11,12 @@ buildscript {
 
     dependencies {
         classpath "de.jensklingenberg:gradle-plugin:1.0.0"
-
     }
-
 }
 plugins {
     id 'org.jetbrains.kotlin.multiplatform' version '1.4.30'
 }
-
+apply plugin: 'compiler.plugin.helloworld'
 
 System.setProperty("kotlin.compiler.execution.strategy", "in-process") // For debugging
 
@@ -32,10 +29,6 @@ allprojects {
     }
 }
 
-
-apply plugin: 'compiler.plugin.helloworld'
-
-
 helloWorld {
     enabled = true
 }
@@ -50,8 +43,6 @@ allprojects {
         maven { url "https://plugins.gradle.org/m2/" }
         google()
         jcenter()
-
-
     }
 }
 
@@ -87,7 +78,6 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-
             }
         }
         jsTest {

buildSrc/compiler-plugin/gradle-plugin/src/main/java/de/jensklingenberg/gradle/HelloWorldGradleSubplugin.kt

@@ -13,6 +13,13 @@ open class TestCompilerExtension {
 
 class HelloWorldGradleSubPlugin : KotlinCompilerPluginSupportPlugin {
 
+    companion object {
+        const val SERIALIZATION_GROUP_NAME = "de.jensklingenberg"
+        const val ARTIFACT_NAME = "kotlin-compiler-plugin"
+        const val NATIVE_ARTIFACT_NAME = "$ARTIFACT_NAME-native"
+        const val VERSION_NUMBER = "0.0.1"
+    }
+
     private var gradleExtension : TestCompilerExtension = TestCompilerExtension()
 
     override fun applyToCompilation(kotlinCompilation: KotlinCompilation<*>): Provider<List<SubpluginOption>> {
@@ -40,18 +47,18 @@ class HelloWorldGradleSubPlugin : KotlinCompilerPluginSupportPlugin {
     override fun getCompilerPluginId(): String = "helloWorldPlugin"
 
     override fun getPluginArtifact(): SubpluginArtifact = SubpluginArtifact(
-        groupId = "de.jensklingenberg",
-        artifactId = "kotlin-compiler-plugin",
-        version = "0.0.1" // remember to bump this version before any release!
+        groupId = SERIALIZATION_GROUP_NAME,
+        artifactId = ARTIFACT_NAME,
+        version = VERSION_NUMBER // remember to bump this version before any release!
     )
 
     override fun isApplicable(kotlinCompilation: KotlinCompilation<*>): Boolean {
         return true
     }
 
     override fun getPluginArtifactForNative(): SubpluginArtifact = SubpluginArtifact(
-        groupId = "de.jensklingenberg",
-        artifactId = "kotlin-compiler-native-plugin",
-        version = "0.0.1" // remember to bump this version before any release!
+        groupId = SERIALIZATION_GROUP_NAME,
+        artifactId = NATIVE_ARTIFACT_NAME,
+        version = VERSION_NUMBER // remember to bump this version before any release!
     )
 }

buildSrc/compiler-plugin/kotlin-native-plugin/build.gradle

@@ -1,6 +1,9 @@
-apply plugin: "org.jetbrains.kotlin.jvm"
+plugins {
+    id("maven")
+    id 'org.jetbrains.kotlin.jvm'
+}
+
 apply plugin: "kotlin-kapt"
-apply plugin: "maven"
 
 
 group = "de.jensklingenberg"
@@ -9,7 +12,7 @@ version = "0.0.1"
 
 install {
     repositories.mavenInstaller {
-        pom.artifactId = 'kotlin-compiler-native-plugin'
+        pom.artifactId = 'kotlin-compiler-plugin-native'
     }
 }
 
@@ -21,9 +24,8 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib"
     implementation "org.jetbrains.kotlin:kotlin-gradle-plugin-api"
     compileOnly "org.jetbrains.kotlin:kotlin-compiler"
-//    implementation "org.jetbrains.kotlin:kotlin-platform-api:$kotlin_version"
-    compileOnly "com.google.auto.service:auto-service:1.0-rc6"
-    kapt "com.google.auto.service:auto-service:1.0-rc6"
+    compileOnly "com.google.auto.service:auto-service:1.0-rc7"
+    kapt "com.google.auto.service:auto-service:1.0-rc7"
 }
 
 compileKotlin {

buildSrc/compiler-plugin/kotlin-native-plugin/src/main/java/de/jensklingenberg/NativeTestComponentRegistrar.kt

@@ -28,7 +28,5 @@ class NativeTestComponentRegistrar : ComponentRegistrar {
                 "*** Hello from ***" + it.path
             )
         }
-
-
     }
 }

buildSrc/compiler-plugin/kotlin-plugin/build.gradle

@@ -1,6 +1,9 @@
-apply plugin: "org.jetbrains.kotlin.jvm"
+plugins {
+    id("maven")
+    id 'org.jetbrains.kotlin.jvm'
+}
+
 apply plugin: "kotlin-kapt"
-apply plugin: "maven"
 
 
 group = "de.jensklingenberg"
@@ -21,9 +24,8 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib"
     implementation "org.jetbrains.kotlin:kotlin-gradle-plugin-api"
     compileOnly "org.jetbrains.kotlin:kotlin-compiler-embeddable"
-//    implementation "org.jetbrains.kotlin:kotlin-platform-api:$kotlin_version"
-    compileOnly "com.google.auto.service:auto-service:1.0-rc6"
-    kapt "com.google.auto.service:auto-service:1.0-rc6"
+    compileOnly "com.google.auto.service:auto-service:1.0-rc7"
+    kapt "com.google.auto.service:auto-service:1.0-rc7"
 }
 
 compileKotlin {