Upgrade to Kotlin 1.4.0 (nhachicha#1)

rorbech · web-flow · commit ec26907a60fb · 2020-09-03T09:10:42.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -3,14 +3,15 @@ buildscript {
         mavenLocal()
     }
     ext.versions = [
-        'kotlin': '1.3.61',
+        'kotlin': '1.4.0',
         'autoService': '1.0-rc6'
     ]
 
     ext.deps = [
         'kotlin': [
             'stdlib': "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}",
-            'compiler': "org.jetbrains.kotlin:kotlin-compiler:${versions.kotlin}",
+//            'compiler': "org.jetbrains.kotlin:kotlin-compiler:${versions.kotlin}",
+            'compiler': "org.jetbrains.kotlin:kotlin-compiler-embeddable",
             'gradle': "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
         ],
         'autoService': [
@@ -21,7 +22,7 @@ buildscript {
 }
 
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.3.61'
+    id 'org.jetbrains.kotlin.jvm' version '1.4.0'
 }
 
 group 'dev.nhachicha'
diff --git a/compiler-plugin/build.gradle b/compiler-plugin/build.gradle
@@ -18,20 +18,20 @@ shadowJar {
     // use the same artifact name, but within a different location
     archiveClassifier.set("")
     destinationDirectory = file("$buildDir/shaded")
-    relocate "com.intellij", "org.jetbrains.kotlin.com.intellij"
+    relocate "org.jetbrains.kotlin.com.intellij", "com.intellij"
 }
 
 def id = 'accessor-modifier-compiler-plugin'
 
 publishing {
     publications {
-        unshaded(MavenPublication) { // unshaded artifact for Kotlin/Native (Konan)
-            artifactId "${id}-unshaded"
+        unshaded(MavenPublication) { // unshaded artifact for Koltin JVM
+            artifactId "${id}"
             from components.java
         }
 
-        shaded(MavenPublication) { // shaded artifact for Koltin JVM
-            artifactId id
+        shaded(MavenPublication) { // shaded artifact for Kotlin/Native (Konan)
+            artifactId "${id}-shaded"
             artifact shadowJar
         }
     }
diff --git a/compiler-plugin/src/main/kotlin/dev/nhachicha/AccessorModifierPlugin.kt b/compiler-plugin/src/main/kotlin/dev/nhachicha/AccessorModifierPlugin.kt
@@ -17,36 +17,26 @@
 package dev.nhachicha
 
 import com.google.auto.service.AutoService
-import com.intellij.mock.MockProject
-import com.intellij.openapi.project.Project
-import org.jetbrains.kotlin.backend.common.BackendContext
 import org.jetbrains.kotlin.backend.common.FileLoweringPass
+import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
 import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
-import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
-import org.jetbrains.kotlin.backend.common.lower.irBlock
+import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
+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.ir.IrElement
 import org.jetbrains.kotlin.ir.IrStatement
-import org.jetbrains.kotlin.ir.builders.createTmpVariable
-import org.jetbrains.kotlin.ir.builders.irCall
-import org.jetbrains.kotlin.ir.builders.irGet
-import org.jetbrains.kotlin.ir.builders.irString
+import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.declarations.IrFunction
+import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
 import org.jetbrains.kotlin.ir.declarations.isPropertyAccessor
 import org.jetbrains.kotlin.ir.expressions.IrExpression
-import org.jetbrains.kotlin.ir.expressions.IrGetField
-import org.jetbrains.kotlin.ir.types.isNullableAny
+import org.jetbrains.kotlin.ir.expressions.IrReturn
 import org.jetbrains.kotlin.ir.types.isNullableString
 import org.jetbrains.kotlin.ir.types.isString
-import org.jetbrains.kotlin.ir.util.constructors
-import org.jetbrains.kotlin.ir.util.functions
 import org.jetbrains.kotlin.ir.util.isGetter
-import org.jetbrains.kotlin.ir.util.statements
 import org.jetbrains.kotlin.ir.visitors.*
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.resolve.BindingContext
 
 @AutoService(ComponentRegistrar::class)
 class AccessorModifierComponentRegistrar : ComponentRegistrar {
@@ -55,7 +45,7 @@ class AccessorModifierComponentRegistrar : ComponentRegistrar {
     }
 
     companion object {
-        fun registerExtensions(project: Project, configuration: CompilerConfiguration) {
+        fun registerExtensions(project: MockProject, configuration: CompilerConfiguration) {
             IrGenerationExtension.registerExtension(
                     project,
                     AccessorModifierIrGenerationExtension()
@@ -66,76 +56,38 @@ class AccessorModifierComponentRegistrar : ComponentRegistrar {
 
 class AccessorModifierIrGenerationExtension : IrGenerationExtension {
 
-    override fun generate(
-            f: IrFile,
-            backendContext: BackendContext,
-            bindingContext: BindingContext
-    ) {
-        AccessorCallTransformer(backendContext).runOnFileInOrder(f)
+    override fun generate(moduleFragment: IrModuleFragment, pluginContext: IrPluginContext) {
+        for (file in moduleFragment.files) {
+            AccessorCallTransformer(pluginContext).runOnFileInOrder(file)
+        }
     }
 
     class AccessorCallTransformer(
-            val context: BackendContext
-    ) : IrElementTransformerVoid(), FileLoweringPass {
-
-        private val nameToString = Name.identifier("toString")
-        private val nameAppend = Name.identifier("append")
-        private val stringBuilder = context.ir.symbols.stringBuilder.owner
-        private val prefix = "Hello "
-
-        private val constructor = stringBuilder.constructors.single {
-            it.valueParameters.size == 0
-        }
-
-        private val toStringFunction = stringBuilder.functions.single {
-            it.valueParameters.size == 0 && it.name == nameToString
-        }
-
-        private val appendFunction = stringBuilder.functions.single {
-            it.name == nameAppend &&
-                    it.valueParameters.size == 1 &&
-                    it.valueParameters.single().type.isNullableAny()
-        }
+            val context: IrPluginContext
+    ) : IrElementTransformerVoidWithContext(), FileLoweringPass {
 
         override fun lower(irFile: IrFile) {
             irFile.transformChildrenVoid()
         }
 
-        override fun visitFunction(declaration: IrFunction): IrStatement {
-
-            // Modify only property accessor getter for type String or nullable String
+        override fun visitFunctionNew(declaration: IrFunction): IrStatement {
             return if (declaration.isPropertyAccessor
                     && declaration.isGetter
                     && (declaration.returnType.isString() || declaration.returnType.isNullableString())
             ) {
-                declaration.transformChildrenVoid(this)
-                for (statement in declaration.body?.statements!!) {
-                    statement.transformChildrenVoid(object : IrElementTransformerVoid() {
-                        override fun visitGetField(expression: IrGetField): IrExpression {
-                            return context.createIrBuilder(expression.symbol, expression.startOffset, expression.endOffset).irBlock(expression) {
-                                val stringBuilderImpl = createTmpVariable(irCall(constructor))
-
-                                +irCall(appendFunction).apply {
-                                    dispatchReceiver = irGet(stringBuilderImpl)
-                                    putValueArgument(0, irString(prefix)) // appending PROPERTY_BACKING_FIELD
-                                }
-
-                                +irCall(appendFunction).apply {
-                                    dispatchReceiver = irGet(stringBuilderImpl)
-                                    putValueArgument(0, expression) // appending PROPERTY_BACKING_FIELD
-                                }
-                                // create an irCall and add it to this IrBuilder block
-                                +irCall(toStringFunction).apply {
-                                    dispatchReceiver /* <-- to String called on --> */ = irGet(stringBuilderImpl)
-                                }
-                            }
+                declaration.body?.transformChildrenVoid(object : IrElementTransformerVoid() {
+                    override fun visitReturn(expression: IrReturn): IrExpression {
+                        return IrBlockBuilder(context, currentScope?.scope!!, expression.startOffset, expression.endOffset).irBlock {
+                            val irConcat = irConcat()
+                            irConcat.addArgument(irString("Hello "))
+                            irConcat.addArgument(expression.value)
+                            +irReturn(irConcat)
                         }
-                    })
-                }
-
-                super.visitFunction(declaration)
+                    }
+                })
+                super.visitFunctionNew(declaration)
             } else {
-                super.visitFunction(declaration)
+                super.visitFunctionNew(declaration)
             }
         }
 
@@ -154,4 +106,3 @@ fun FileLoweringPass.runOnFileInOrder(irFile: IrFile) {
         }
     })
 }
-
diff --git a/example/build.gradle b/example/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.4.0'
     repositories {
         mavenLocal()
         mavenCentral()
@@ -13,7 +13,7 @@ buildscript {
 
 
 plugins {
-    id 'org.jetbrains.kotlin.multiplatform' version '1.3.61'
+    id 'org.jetbrains.kotlin.multiplatform' version '1.4.0'
 }
 repositories {
     mavenLocal()
diff --git a/example/gradle/wrapper/gradle-wrapper.properties b/example/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,9 @@
+#Wed May 13 20:54:17 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+
+# The current Gradle version 5.5.1 is not compatible with the Kotlin Multiplatform plugin. Please use Gradle 6.0 or newer, or the previous version of the Kotlin plugin.
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+
diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle
@@ -27,7 +27,7 @@ gradlePlugin {
             id = "dev.nhachicha.accessor-modifier-compiler-plugin"
             displayName = "Accessor modifier compiler plugin"
             description = "Example Plugin using IR to modify accessor of a class (KMP)"
-            implementationClass = "dev.nhachicha.gradle.AccessorModifierGradleSubplugin"
+            implementationClass = "dev.nhachicha.gradle.AccessorModifierKotlinGradleSubplugin"
         }
     }
 }
@@ -37,4 +37,4 @@ dependencies {
     kapt deps.autoService.compiler
     compileOnly deps.autoService.annotations
 
-}
+}
diff --git a/gradle-plugin/src/main/kotlin/dev/nhachicha/gradle/AccessorModifierSubplugin.kt b/gradle-plugin/src/main/kotlin/dev/nhachicha/gradle/AccessorModifierSubplugin.kt
@@ -19,49 +19,45 @@ package dev.nhachicha.gradle
 import com.google.auto.service.AutoService
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.tasks.compile.AbstractCompile
+import org.gradle.api.provider.Provider
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
-import org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin
+import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerPluginSupportPlugin
 import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact
 import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
 
 class AccessorModifierGradleSubplugin : Plugin<Project> {
     companion object {
-        fun isEnabled(project: Project) = project.plugins.findPlugin(AccessorModifierGradleSubplugin::class.java) != null
+        fun isEnabled(project: Project) = project.plugins.findPlugin(AccessorModifierKotlinGradleSubplugin::class.java) != null
     }
 
     override fun apply(project: Project) {}
 }
 
-@AutoService(KotlinGradleSubplugin::class)
-class AccessorModifierKotlinGradleSubplugin : KotlinGradleSubplugin<AbstractCompile> {
+@AutoService(KotlinCompilerPluginSupportPlugin::class)
+class AccessorModifierKotlinGradleSubplugin : KotlinCompilerPluginSupportPlugin {
     companion object {
         const val ARTIFACT_GROUP_NAME = "dev.nhachicha"
-        const val ARTIFACT_SHADED_NAME = "accessor-modifier-compiler-plugin"
-        const val ARTIFACT_UNSHADED_NAME = "accessor-modifier-compiler-plugin-unshaded"
+        const val ARTIFACT_NAME = "accessor-modifier-compiler-plugin"
+        const val ARTIFACT_SHADED_NAME = "accessor-modifier-compiler-plugin-shaded"
         const val ARTIFACT_VERSION = "0.0.1-SNAPSHOT"
         const val PLUGIN_ID = "dev.nhachicha.accessor-modifier-compiler-plugin"
     }
 
-    override fun isApplicable(project: Project, task: AbstractCompile): Boolean =
-            AccessorModifierGradleSubplugin.isEnabled(project)
+    override fun isApplicable(kotlinCompilation: KotlinCompilation<*>): Boolean =
+            AccessorModifierGradleSubplugin.isEnabled(kotlinCompilation.target.project)
 
-    override fun apply(
-            project: Project,
-            kotlinCompile: AbstractCompile,
-            javaCompile: AbstractCompile?,
-            variantData: Any?,
-            androidProjectHandler: Any?,
-            kotlinCompilation: KotlinCompilation<*>?
-    ): List<SubpluginOption> {
-        return emptyList()
+    override fun applyToCompilation(kotlinCompilation: KotlinCompilation<*>): Provider<List<SubpluginOption>> {
+        val project = kotlinCompilation.target.project
+        return project.provider {
+            listOf(SubpluginOption(key = "optio-key", value = "option-value"))
+        }
     }
 
     override fun getPluginArtifact(): SubpluginArtifact =
-            SubpluginArtifact(ARTIFACT_GROUP_NAME, ARTIFACT_SHADED_NAME, ARTIFACT_VERSION)
+            SubpluginArtifact(ARTIFACT_GROUP_NAME, ARTIFACT_NAME, ARTIFACT_VERSION)
 
-    override fun getNativeCompilerPluginArtifact(): SubpluginArtifact? =
-            SubpluginArtifact(ARTIFACT_GROUP_NAME, ARTIFACT_UNSHADED_NAME, ARTIFACT_VERSION)
+    override fun getPluginArtifactForNative(): SubpluginArtifact? =
+            SubpluginArtifact(ARTIFACT_GROUP_NAME, ARTIFACT_SHADED_NAME, ARTIFACT_VERSION)
 
     override fun getCompilerPluginId() = PLUGIN_ID
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,15 @@ buildscript {`
`3`	`3`	`mavenLocal()`
`4`	`4`	`}`
`5`	`5`	`ext.versions = [`
`6`		`- 'kotlin': '1.3.61',`
	`6`	`+ 'kotlin': '1.4.0',`
`7`	`7`	`'autoService': '1.0-rc6'`
`8`	`8`	`]`
`9`	`9`
`10`	`10`	`ext.deps = [`
`11`	`11`	`'kotlin': [`
`12`	`12`	`'stdlib': "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}",`
`13`		`- 'compiler': "org.jetbrains.kotlin:kotlin-compiler:${versions.kotlin}",`
	`13`	`+// 'compiler': "org.jetbrains.kotlin:kotlin-compiler:${versions.kotlin}",`
	`14`	`+ 'compiler': "org.jetbrains.kotlin:kotlin-compiler-embeddable",`
`14`	`15`	`'gradle': "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",`
`15`	`16`	`],`
`16`	`17`	`'autoService': [`
`@@ -21,7 +22,7 @@ buildscript {`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`plugins {`
`24`		`- id 'org.jetbrains.kotlin.jvm' version '1.3.61'`
	`25`	`+ id 'org.jetbrains.kotlin.jvm' version '1.4.0'`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`group 'dev.nhachicha'`
Original file line number	Diff line number	Diff line change
`@@ -18,20 +18,20 @@ shadowJar {`
`18`	`18`	`// use the same artifact name, but within a different location`
`19`	`19`	`archiveClassifier.set("")`
`20`	`20`	`destinationDirectory = file("$buildDir/shaded")`
`21`		`- relocate "com.intellij", "org.jetbrains.kotlin.com.intellij"`
	`21`	`+ relocate "org.jetbrains.kotlin.com.intellij", "com.intellij"`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`def id = 'accessor-modifier-compiler-plugin'`
`25`	`25`
`26`	`26`	`publishing {`
`27`	`27`	`publications {`
`28`		`- unshaded(MavenPublication) { // unshaded artifact for Kotlin/Native (Konan)`
`29`		`- artifactId "${id}-unshaded"`
	`28`	`+ unshaded(MavenPublication) { // unshaded artifact for Koltin JVM`
	`29`	`+ artifactId "${id}"`
`30`	`30`	`from components.java`
`31`	`31`	`}`
`32`	`32`
`33`		`- shaded(MavenPublication) { // shaded artifact for Koltin JVM`
`34`		`- artifactId id`
	`33`	`+ shaded(MavenPublication) { // shaded artifact for Kotlin/Native (Konan)`
	`34`	`+ artifactId "${id}-shaded"`
`35`	`35`	`artifact shadowJar`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ gradlePlugin {`
`27`	`27`	`id = "dev.nhachicha.accessor-modifier-compiler-plugin"`
`28`	`28`	`displayName = "Accessor modifier compiler plugin"`
`29`	`29`	`description = "Example Plugin using IR to modify accessor of a class (KMP)"`
`30`		`- implementationClass = "dev.nhachicha.gradle.AccessorModifierGradleSubplugin"`
	`30`	`+ implementationClass = "dev.nhachicha.gradle.AccessorModifierKotlinGradleSubplugin"`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`}`
`@@ -37,4 +37,4 @@ dependencies {`
`37`	`37`	`kapt deps.autoService.compiler`
`38`	`38`	`compileOnly deps.autoService.annotations`
`39`	`39`
`40`		`-}`
	`40`	`+}`