From b38cfd1f666b14ad01ff27fb0240c25edea042fb Mon Sep 17 00:00:00 2001 From: tschuchortdev Date: Mon, 13 Jun 2022 23:35:29 +0200 Subject: [PATCH] Update to Kotlin 1.7.0 and release --- README.md | 6 +++--- build.gradle | 4 ++-- .../tschuchort/compiletesting/AbstractKotlinCompilation.kt | 1 + .../com/tschuchort/compiletesting/KotlinJsCompilation.kt | 4 ---- gradle.properties | 2 +- ksp/build.gradle | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 497a9dfc..a6b9c84f 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ Add dependency to your module's `build.gradle` file: ```Groovy dependencies { // ... - testImplementation 'com.github.tschuchortdev:kotlin-compile-testing:1.4.7' + testImplementation 'com.github.tschuchortdev:kotlin-compile-testing:1.4.9' } ``` @@ -109,7 +109,7 @@ Kotlin-Compile-Testing is compatible with all _local_ compiler versions. It does However, if your project or any of its dependencies depend directly on compiler artifacts such as `kotlin-compiler-embeddable` or `kotlin-annotation-processing-embeddable` then they have to be the same version as the one used by Kotlin-Compile-Testing or there will be a transitive dependency conflict. -- Current `kotlin-compiler-embeddable` version: `1.6.10` +- Current `kotlin-compiler-embeddable` version: `1.7.0` Because the internal APIs of the Kotlin compiler often change between versions, we can only support one `kotlin-compiler-embeddable` version at a time. @@ -121,7 +121,7 @@ To test KSP processors, you need to use the KSP dependency: ```Groovy dependencies { - testImplementation 'com.github.tschuchortdev:kotlin-compile-testing-ksp:1.4.7' + testImplementation 'com.github.tschuchortdev:kotlin-compile-testing-ksp:1.4.9' } ``` diff --git a/build.gradle b/build.gradle index 8280a766..4d657d2a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { - ext.kotlin_version = '1.6.10' - ext.embedded_kotlin_version = '1.6.20-M1'//'1.6.20-M1-1.0.2' + ext.kotlin_version = '1.7.0' + ext.embedded_kotlin_version = '1.7.0' repositories { mavenCentral() diff --git a/core/src/main/kotlin/com/tschuchort/compiletesting/AbstractKotlinCompilation.kt b/core/src/main/kotlin/com/tschuchort/compiletesting/AbstractKotlinCompilation.kt index b0b41743..a133feea 100644 --- a/core/src/main/kotlin/com/tschuchort/compiletesting/AbstractKotlinCompilation.kt +++ b/core/src/main/kotlin/com/tschuchort/compiletesting/AbstractKotlinCompilation.kt @@ -276,4 +276,5 @@ internal fun convertKotlinExitCode(code: ExitCode) = when(code) { ExitCode.INTERNAL_ERROR -> KotlinCompilation.ExitCode.INTERNAL_ERROR ExitCode.COMPILATION_ERROR -> KotlinCompilation.ExitCode.COMPILATION_ERROR ExitCode.SCRIPT_EXECUTION_ERROR -> KotlinCompilation.ExitCode.SCRIPT_EXECUTION_ERROR + ExitCode.OOM_ERROR -> throw OutOfMemoryError("Kotlin compiler ran out of memory") } diff --git a/core/src/main/kotlin/com/tschuchort/compiletesting/KotlinJsCompilation.kt b/core/src/main/kotlin/com/tschuchort/compiletesting/KotlinJsCompilation.kt index da747f31..03d887b3 100644 --- a/core/src/main/kotlin/com/tschuchort/compiletesting/KotlinJsCompilation.kt +++ b/core/src/main/kotlin/com/tschuchort/compiletesting/KotlinJsCompilation.kt @@ -24,9 +24,6 @@ class KotlinJsCompilation : AbstractKotlinCompilation() { /** Perform experimental dead code elimination */ var irDce: Boolean = false - /** Perform a more experimental faster dead code elimination */ - var irDceDriven: Boolean = false - /** Print declarations' reachability info to stdout during performing DCE */ var irDcePrintReachabilityInfo: Boolean = false @@ -87,7 +84,6 @@ class KotlinJsCompilation : AbstractKotlinCompilation() { args.irProduceKlibFile = irProduceKlibFile args.irProduceJs = irProduceJs args.irDce = irDce - args.irDceDriven = irDceDriven args.irDcePrintReachabilityInfo = irDcePrintReachabilityInfo args.irOnly = irOnly args.irModuleName = irModuleName diff --git a/gradle.properties b/gradle.properties index f66681d0..3e020f4d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ kotlin.incremental=false kapt.include.compile.classpath=false GROUP=com.github.tschuchortdev -VERSION_NAME=1.4.8-SNAPSHOT +VERSION_NAME=1.4.9 POM_DESCRIPTION=A library that enables testing of Kotlin annotation processors, compiler plugins and code generation. POM_INCEPTION_YEAR=2019 POM_URL=https\://github.com/tschuchortdev/kotlin-compile-testing diff --git a/ksp/build.gradle b/ksp/build.gradle index 5f1ba803..58994e2a 100644 --- a/ksp/build.gradle +++ b/ksp/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.ksp_version='1.6.20-M1-1.0.2' + ext.ksp_version='1.7.0-1.0.6' } dependencies {