kotlin 1.8.2

bnorm · Apr 7, 2023 · a8073b0 · a8073b0
1 parent 54df38a
commit a8073b0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-  kotlin("jvm") version "1.7.0" apply false
-  id("org.jetbrains.dokka") version "1.7.0" apply false
+  kotlin("jvm") version "1.8.20" apply false
+  id("org.jetbrains.dokka") version "1.8.10" apply false
   id("com.gradle.plugin-publish") version "1.1.0" apply false
   id("com.github.gmazzo.buildconfig") version "3.1.0" apply false
   id("org.jmailen.kotlinter") version "3.14.0" apply false

diff --git a/kotlin-power-assert-gradle/build.gradle.kts b/kotlin-power-assert-gradle/build.gradle.kts
@@ -34,6 +34,10 @@ gradlePlugin {
     }
   }
 }
+tasks.withType<JavaCompile> {
+  sourceCompatibility = "1.8"
+  targetCompatibility = "1.8"
+}
 
 tasks.withType<KotlinCompile> {
   kotlinOptions.jvmTarget = "1.8"

diff --git a/kotlin-power-assert-plugin/build.gradle.kts b/kotlin-power-assert-plugin/build.gradle.kts
@@ -18,12 +18,17 @@ dependencies {
 
   testImplementation(kotlin("test-junit5"))
   testImplementation("org.jetbrains.kotlin:kotlin-compiler-embeddable")
-  testImplementation("com.github.tschuchortdev:kotlin-compile-testing:1.4.9")
+  testImplementation("com.github.tschuchortdev:kotlin-compile-testing:1.5.0")
   testImplementation(enforcedPlatform("org.junit:junit-bom:5.9.1"))
 }
 
 tasks.withType<KotlinCompile> {
   kotlinOptions.jvmTarget = "1.8"
+  kotlinOptions.freeCompilerArgs = listOf("-opt-in=org.jetbrains.kotlin.backend.common.extensions.FirIncompatiblePluginAPI","-opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi")
+}
+tasks.withType<JavaCompile> {
+  sourceCompatibility = "1.8"
+  targetCompatibility = "1.8"
 }
 
 tasks.withType<Test> {

diff --git a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/compiler.kt b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/compiler.kt
@@ -32,7 +32,7 @@ private val DEFAULT_COMPONENT_REGISTRARS = arrayOf(
 
 fun compile(
   list: List<SourceFile>,
-  vararg plugins: ComponentRegistrar = DEFAULT_COMPONENT_REGISTRARS,
+  vararg componentRegistrars: ComponentRegistrar = DEFAULT_COMPONENT_REGISTRARS,
 ): KotlinCompilation.Result {
   return KotlinCompilation().apply {
     sources = list
@@ -46,7 +46,7 @@ fun compile(
         // black hole all writes
       }
     }
-    compilerPlugins = plugins.toList()
+    this.componentRegistrars = componentRegistrars.toList()
     inheritClassPath = true
   }.compile()
 }