Update to Kotlin 1.3.60 (#31)

* Update to Kotlin 1.3.60

Note that since this is using private APIs of kotlin, it's not possible to support older versions simultaneously since it's not possible to detect what version of the tools you're consuming are without some very uncomfortable reflection.

Author: ZacSweers

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.3.60'
 
     repositories {
         mavenCentral()
@@ -15,7 +15,7 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.3.50'
+    id 'org.jetbrains.kotlin.jvm' version '1.3.60'
 }
 
 apply plugin: 'kotlin'
@@ -56,12 +56,12 @@ dependencies {
 
     // This dependency is only needed as a "sample" compiler plugin to test that
     // running compiler plugins passed via the pluginClasspath CLI option works
-    testRuntime "org.jetbrains.kotlin:kotlin-scripting-compiler:1.3.50"
+    testRuntime "org.jetbrains.kotlin:kotlin-scripting-compiler:1.3.60"
 
     // The Kotlin compiler should be near the end of the list because its .jar file includes
     // an obsolete version of Guava
-    implementation "org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.50"
-    implementation "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:1.3.50"
+    implementation "org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.60"
+    implementation "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:1.3.60"
 }
 
 compileKotlin {

src/main/kotlin/com/tschuchort/compiletesting/KaptComponentRegistrar.kt

@@ -46,6 +46,7 @@ import org.jetbrains.kotlin.kapt3.util.MessageCollectorBackedKaptLogger
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.BindingTrace
 import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
+import org.jetbrains.kotlin.resolve.jvm.extensions.PartialAnalysisHandlerExtension
 import java.io.File
 
 internal class KaptComponentRegistrar(
@@ -96,7 +97,10 @@ internal class KaptComponentRegistrar(
         }
 
         AnalysisHandlerExtension.registerExtension(project, kapt3AnalysisCompletedHandlerExtension)
-        StorageComponentContainerContributor.registerExtension(project, Kapt3ComponentRegistrar.KaptComponentContributor())
+        StorageComponentContainerContributor.registerExtension(
+            project = project,
+            extension = Kapt3ComponentRegistrar.KaptComponentContributor(kapt3AnalysisCompletedHandlerExtension)
+        )
     }
 
     private fun KaptOptions.Builder.checkOptions(project: MockProject, logger: KaptLogger, configuration: CompilerConfiguration): Boolean {

src/test/kotlin/com/tschuchort/compiletesting/KotlinCompilationTests.kt

@@ -628,7 +628,7 @@ class KotlinCompilationTests {
 	fun `detects the plugin provided for compilation via pluginClasspaths property`() {
 		val result = defaultCompilerConfig().apply {
 			sources = listOf(SourceFile.kotlin("kSource.kt", "class KSource"))
-			pluginClasspaths = listOf(classpathOf("kotlin-scripting-compiler-1.3.50"))
+			pluginClasspaths = listOf(classpathOf("kotlin-scripting-compiler-1.3.60"))
 		}.compile()
 
 		assertThat(result.exitCode).isEqualTo(ExitCode.OK)