Skip to content

Commit 801c4c2

Browse files
committed
Bump bundled compiler version to 1.3.41. Scripts not working
1 parent 338572b commit 801c4c2

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.3.31'
2+
ext.kotlin_version = '1.3.41'
33

44
repositories {
55
mavenCentral()
@@ -13,7 +13,7 @@ buildscript {
1313

1414
plugins {
1515
id 'java'
16-
id 'org.jetbrains.kotlin.jvm' version '1.3.21'
16+
id 'org.jetbrains.kotlin.jvm' version '1.3.41'
1717
}
1818

1919
apply plugin: 'kotlin'
@@ -56,8 +56,8 @@ dependencies {
5656

5757
// the Kotlin compiler should be near the end of the list because its .jar file includes
5858
// an obsolete version of Guava
59-
implementation "org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.21"
60-
implementation "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:1.3.21"
59+
implementation "org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.41"
60+
implementation "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:1.3.41"
6161
}
6262

6363
compileKotlin {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import org.jetbrains.kotlin.kapt3.AbstractKapt3Extension
4040
import org.jetbrains.kotlin.kapt3.Kapt3ComponentRegistrar
4141
import org.jetbrains.kotlin.kapt3.base.Kapt
4242
import org.jetbrains.kotlin.kapt3.base.LoadedProcessors
43+
import org.jetbrains.kotlin.kapt3.base.incremental.IncrementalProcessor
4344
import org.jetbrains.kotlin.kapt3.base.util.KaptLogger
4445
import org.jetbrains.kotlin.kapt3.util.MessageCollectorBackedKaptLogger
4546
import org.jetbrains.kotlin.psi.KtFile
@@ -170,7 +171,7 @@ internal class KaptComponentRegistrar : ComponentRegistrar {
170171
}
171172

172173
data class Parameters(
173-
val processors: List<Processor>,
174+
val processors: List<IncrementalProcessor>,
174175
val kaptOptions: KaptOptions.Builder
175176
)
176177
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ import org.jetbrains.kotlin.config.JVMAssertionsMode
3131
import org.jetbrains.kotlin.config.JvmDefaultMode
3232
import org.jetbrains.kotlin.config.JvmTarget
3333
import org.jetbrains.kotlin.config.Services
34+
import org.jetbrains.kotlin.kapt3.base.incremental.DeclaredProcType
35+
import org.jetbrains.kotlin.kapt3.base.incremental.IncrementalProcessor
3436
import java.io.*
3537
import java.lang.RuntimeException
3638
import java.net.URI
@@ -97,8 +99,6 @@ class KotlinCompilation {
9799
/** Report on performance of the compilation */
98100
var reportPerformance: Boolean = false
99101

100-
var loadBuiltInsFromDependencies: Boolean = false
101-
102102
/** Name of the generated .kotlin_module file */
103103
var moduleName: String? = null
104104

@@ -398,7 +398,6 @@ class KotlinCompilation {
398398
it.reportOutputFiles = reportOutputFiles
399399
it.reportPerf = reportPerformance
400400
it.reportOutputFiles = reportOutputFiles
401-
it.loadBuiltInsFromDependencies = loadBuiltInsFromDependencies
402401
}
403402

404403
/** Performs the 1st and 2nd compilation step to generate stubs and run annotation processors */
@@ -429,7 +428,10 @@ class KotlinCompilation {
429428
* any parameters that change between compilations
430429
*/
431430
KaptComponentRegistrar.threadLocalParameters.set(
432-
KaptComponentRegistrar.Parameters(annotationProcessors, kaptOptions)
431+
KaptComponentRegistrar.Parameters(
432+
annotationProcessors.map { IncrementalProcessor(it, DeclaredProcType.NON_INCREMENTAL) },
433+
kaptOptions
434+
)
433435
)
434436

435437
val kotlinSources = sourcesDir.listFilesRecursively().filter<File>(File::isKotlinFile)

0 commit comments

Comments
 (0)