Update to Kotlin 1.6.10-RC

google · Dec 7, 2021 · 35681d7 · 35681d7
1 parent fb379bd
commit 35681d7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt
@@ -570,6 +570,7 @@ abstract class KspTaskJvm : KotlinCompile(KotlinJvmOptionsImpl()), KspTask {
         args: K2JVMCompilerArguments,
         sourceRoots: SourceRoots,
         changedFiles: ChangedFiles,
+        taskOutputsBackup: TaskOutputsBackup?,
     ) {
         if (isKspIncremental) {
             if (isIntermoduleIncremental) {
@@ -587,7 +588,7 @@ abstract class KspTaskJvm : KotlinCompile(KotlinJvmOptionsImpl()), KspTask {
             clearIncCache()
         }
         args.addChangedFiles(changedFiles)
-        super.callCompilerAsync(args, sourceRoots, changedFiles)
+        super.callCompilerAsync(args, sourceRoots, changedFiles, taskOutputsBackup)
     }
 
     override fun skipCondition(): Boolean = false
@@ -650,13 +651,14 @@ abstract class KspTaskJS @Inject constructor(
         args: K2JSCompilerArguments,
         sourceRoots: SourceRoots,
         changedFiles: ChangedFiles,
+        taskOutputsBackup: TaskOutputsBackup?,
     ) {
         if (!isKspIncremental || changedFiles.hasNonSourceChange()) {
             clearIncCache()
         } else {
             args.addChangedFiles(changedFiles)
         }
-        super.callCompilerAsync(args, sourceRoots, changedFiles)
+        super.callCompilerAsync(args, sourceRoots, changedFiles, taskOutputsBackup)
     }
 }
 
@@ -719,13 +721,14 @@ abstract class KspTaskMetadata : KotlinCompileCommon(KotlinMultiplatformCommonOp
         args: K2MetadataCompilerArguments,
         sourceRoots: SourceRoots,
         changedFiles: ChangedFiles,
+        taskOutputsBackup: TaskOutputsBackup?,
     ) {
         if (!isKspIncremental || changedFiles.hasNonSourceChange()) {
             clearIncCache()
         } else {
             args.addChangedFiles(changedFiles)
         }
-        super.callCompilerAsync(args, sourceRoots, changedFiles)
+        super.callCompilerAsync(args, sourceRoots, changedFiles, taskOutputsBackup)
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 # Copied from kotlinc
 org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx2200m -Dfile.encoding=UTF-8
 
-kotlinBaseVersion=1.6.0
+kotlinBaseVersion=1.6.10-RC
 agpBaseVersion=7.0.0
 intellijVersion=203.8084.24
 junitVersion=4.12

diff --git a/.../repo/test-infrastructure-utils-1.6.0.jar → ...o/test-infrastructure-utils-1.6.10-RC.jar b/.../repo/test-infrastructure-utils-1.6.0.jar → ...o/test-infrastructure-utils-1.6.10-RC.jar
diff --git a/...arty/prebuilt/repo/tests-common-1.6.0.jar → .../prebuilt/repo/tests-common-1.6.10-RC.jar b/...arty/prebuilt/repo/tests-common-1.6.0.jar → .../prebuilt/repo/tests-common-1.6.10-RC.jar
diff --git a/...built/repo/tests-compiler-utils-1.6.0.jar → ...t/repo/tests-compiler-utils-1.6.10-RC.jar b/...built/repo/tests-compiler-utils-1.6.0.jar → ...t/repo/tests-compiler-utils-1.6.10-RC.jar
diff --git a/...party/prebuilt/repo/tests-mutes-1.6.0.jar → ...y/prebuilt/repo/tests-mutes-1.6.10-RC.jar b/...party/prebuilt/repo/tests-mutes-1.6.0.jar → ...y/prebuilt/repo/tests-mutes-1.6.10-RC.jar