diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt index 3489ef96ad..fb4ad3a7a0 100644 --- a/buildSrc/src/main/kotlin/Config.kt +++ b/buildSrc/src/main/kotlin/Config.kt @@ -123,15 +123,15 @@ object Versions { const val junit = "4.13.2" // https://mvnrepository.com/artifact/junit/junit const val kbson = "0.4.0" // https://github.com/mongodb/kbson // When updating the Kotlin version, also remember to update /examples/min-android-sample/build.gradle.kts - const val kotlin = "2.0.0" // https://github.com/JetBrains/kotlin and https://kotlinlang.org/docs/releases.html#release-details + const val kotlin = "2.0.20" // https://github.com/JetBrains/kotlin and https://kotlinlang.org/docs/releases.html#release-details const val kotlinJvmTarget = "1.8" // Which JVM bytecode version is kotlin compiled to. - const val latestKotlin = "2.0.0" // https://kotlinlang.org/docs/eap.html#build-details - const val kotlinCompileTesting = "0.5.0-alpha07" // https://github.com/zacsweers/kotlin-compile-testing + const val latestKotlin = "2.0.20" // https://kotlinlang.org/docs/eap.html#build-details + const val kotlinCompileTesting = "0.5.1" // https://github.com/zacsweers/kotlin-compile-testing const val ktlint = "0.45.2" // https://github.com/pinterest/ktlint const val ktor = "2.3.12" // https://github.com/ktorio/ktor const val multidex = "2.0.1" // https://developer.android.com/jetpack/androidx/releases/multidex - const val nexusPublishPlugin = "1.1.0" // https://github.com/gradle-nexus/publish-plugin - const val okio = "3.2.0" // https://square.github.io/okio/#releases + const val nexusPublishPlugin = "1.3.0" // https://github.com/gradle-nexus/publish-plugin + const val okio = "3.9.0" // https://square.github.io/okio/#releases const val relinker = "1.4.5" // https://github.com/KeepSafe/ReLinker const val serialization = "1.7.1" // https://kotlinlang.org/docs/releases.html#release-details const val shadowJar = "6.1.0" // https://mvnrepository.com/artifact/com.github.johnrengelman.shadow/com.github.johnrengelman.shadow.gradle.plugin?repo=gradle-plugins diff --git a/packages/plugin-compiler/src/main/kotlin/io/realm/kotlin/compiler/RealmModelLoweringExtension.kt b/packages/plugin-compiler/src/main/kotlin/io/realm/kotlin/compiler/RealmModelLoweringExtension.kt index c01a74dbcd..4e89b657f8 100644 --- a/packages/plugin-compiler/src/main/kotlin/io/realm/kotlin/compiler/RealmModelLoweringExtension.kt +++ b/packages/plugin-compiler/src/main/kotlin/io/realm/kotlin/compiler/RealmModelLoweringExtension.kt @@ -26,7 +26,6 @@ import org.jetbrains.kotlin.backend.common.CompilationException import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext import org.jetbrains.kotlin.backend.common.runOnFilePostfix -import org.jetbrains.kotlin.backend.common.wrapWithCompilationException import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET import org.jetbrains.kotlin.ir.declarations.IrClass import org.jetbrains.kotlin.ir.declarations.IrFile @@ -76,13 +75,13 @@ private class RealmModelLowering(private val pluginContext: IrPluginContext) : C // Unfortunately we cannot access the IR element of e uniformly across 1.9 and 2.0 so // leaving it as null. Hopefully the embedded cause will give the appropriate pointers // to fix this. - throw e.wrapWithCompilationException("Internal error in realm lowering", it, null) + throw CompilationException("Internal error in realm lowering $it", e, null) } catch (e: KotlinExceptionWithAttachments) { throw e } catch (e: Throwable) { - throw e.wrapWithCompilationException( - "Internal error in file lowering", - it, + throw CompilationException( + "Internal error in file lowering $it", + e, null ) }