Kotlin 1.9 (#357)

* Updates to run with the new Kotlin 1.9-RC version * Kotlin gradle plugin adds stdlib automatically * We dont need to freeze() anymore * Update to Kotlin 1.9.0 Also update yarn.lock, remove deprecated targets and some other cleanup --------- Co-authored-by: Paul Hawke <[email protected]>
touchlab · Jul 21, 2023 · afddc6f · afddc6f
1 parent 84a15f1
commit afddc6f
Show file tree

Hide file tree

Showing 29 changed files with 342 additions and 406 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,10 +1,10 @@
 name: build
-#on: workflow_dispatch
 on:
   pull_request:
   push:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
   build:

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -20,10 +20,10 @@ buildscript {
 
 plugins {
     kotlin("multiplatform") apply false
-    id("com.android.library") version "7.3.1" apply false
+    id("com.android.library") version "7.4.2" apply false
     id("com.github.gmazzo.buildconfig") version "2.1.0" apply false
-    id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.12.1"
-    id("org.jetbrains.dokka") version "1.7.20" apply false
+    id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.2"
+    id("org.jetbrains.dokka") version "1.8.20" apply false
     id("co.touchlab.touchlabtools.docusaurusosstemplate") version "0.1.10"
 }
 apiValidation {
@@ -48,8 +48,7 @@ allprojects {
 allprojects {
     apply(plugin = "org.jetbrains.dokka")
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
     }
-}
+}
diff --git a/extensions/kermit-bugsnag/build.gradle.kts b/extensions/kermit-bugsnag/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
 
 apply(from = "../../gradle/configure-crash-logger.gradle")
 kotlin {
-    android {
+    androidTarget {
         publishAllLibraryVariants()
     }
 
@@ -30,7 +30,6 @@ kotlin {
 
     val androidMain by sourceSets.getting {
         dependencies {
-            implementation("org.jetbrains.kotlin:kotlin-stdlib")
         }
     }
 }

diff --git a/extensions/kermit-crashlytics/build.gradle.kts b/extensions/kermit-crashlytics/build.gradle.kts
@@ -19,7 +19,7 @@ plugins {
 apply(from = "../../gradle/configure-crash-logger.gradle")
 
 kotlin {
-    android {
+    androidTarget {
         publishAllLibraryVariants()
     }
 
@@ -31,7 +31,6 @@ kotlin {
 
     val androidMain by sourceSets.getting {
         dependencies {
-            implementation("org.jetbrains.kotlin:kotlin-stdlib")
         }
     }
 }

diff --git a/extensions/kermit-koin/build.gradle.kts b/extensions/kermit-koin/build.gradle.kts
@@ -17,11 +17,11 @@ plugins {
 }
 
 kotlin {
-    android {
+    androidTarget {
         publishAllLibraryVariants()
     }
     jvm()
-    js(BOTH) {
+    js {
         browser()
         nodejs()
     }
@@ -30,7 +30,6 @@ kotlin {
     macosArm64()
     iosX64()
     iosArm64()
-    iosArm32()
     iosSimulatorArm64()
     watchosArm32()
     watchosArm64()
@@ -45,7 +44,6 @@ kotlin {
     mingwX64()
 
     // TODO: These targets aren't supported by Koin yet:
-    // mingwX86()
     // androidNativeArm32()
     // androidNativeArm64()
     // androidNativeX86()

diff --git a/gradle.properties b/gradle.properties
@@ -5,8 +5,8 @@ org.gradle.jvmargs=-Xmx2g
 SONATYPE_HOST=DEFAULT
 RELEASE_SIGNING_ENABLED=true
 GROUP=co.touchlab
-VERSION_NAME=2.0.0-RC4
-KOTLIN_VERSION=1.8.10
+VERSION_NAME=2.0.0-RC5
+KOTLIN_VERSION=1.9.0
 
 POM_NAME=Kermit
 POM_DESCRIPTION=Kermit The Log
@@ -24,5 +24,4 @@ POM_DEVELOPER_NAME=Kevin Galligan
 POM_DEVELOPER_ORG=Touchlab
 POM_DEVELOPER_URL=https://touchlab.co/
 
-kotlin.mpp.enableCInteropCommonization=true
-kotlin.mpp.commonizerLogLevel=info
+kotlin.js.ir.output.granularity=whole-program
diff --git a/gradle/configure-crash-logger.gradle b/gradle/configure-crash-logger.gradle
@@ -27,7 +27,6 @@ kotlin {
             macosArm64(),
             iosX64(),
             iosArm64(),
-//        iosArm32(),
             iosSimulatorArm64(),
             tvosArm64(),
             tvosSimulatorArm64(),
@@ -36,7 +35,6 @@ kotlin {
             watchosArm64(),
             watchosSimulatorArm64(),
             watchosDeviceArm64(),
-//        watchosX86(),
             watchosX64()
     ].forEach { target ->
 //        target.compilations.main.cinterops.create(project.name) {
@@ -53,11 +51,5 @@ kotlin {
 
     commonMain.dependencies {
         implementation project(":kermit-core")
-        implementation "org.jetbrains.kotlin:kotlin-stdlib-common"
-    }
-
-    commonTest.dependencies {
-        implementation "org.jetbrains.kotlin:kotlin-test-common"
-        implementation "org.jetbrains.kotlin:kotlin-test-annotations-common"
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,8 +5,8 @@ targetSdk = "33"
 compileSdk = "33"
 
 # Dependencies
-kotlin = "1.8.0"
-binaryCompatability = "0.11.0"
+kotlin = "1.9.0"
+binaryCompatability = "0.13.2"
 
 androidx-core = "1.8.0"
 androidx-appcompat = "1.5.1"

diff --git a/kermit-core/api/android/kermit-core.api b/kermit-core/api/android/kermit-core.api
@@ -109,6 +109,7 @@ public final class co/touchlab/kermit/Severity : java/lang/Enum {
 	public static final field Info Lco/touchlab/kermit/Severity;
 	public static final field Verbose Lco/touchlab/kermit/Severity;
 	public static final field Warn Lco/touchlab/kermit/Severity;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Lco/touchlab/kermit/Severity;
 	public static fun values ()[Lco/touchlab/kermit/Severity;
 }

diff --git a/kermit-core/api/jvm/kermit-core.api b/kermit-core/api/jvm/kermit-core.api
@@ -102,6 +102,7 @@ public final class co/touchlab/kermit/Severity : java/lang/Enum {
 	public static final field Info Lco/touchlab/kermit/Severity;
 	public static final field Verbose Lco/touchlab/kermit/Severity;
 	public static final field Warn Lco/touchlab/kermit/Severity;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Lco/touchlab/kermit/Severity;
 	public static fun values ()[Lco/touchlab/kermit/Severity;
 }

diff --git a/kermit-core/build.gradle.kts b/kermit-core/build.gradle.kts
@@ -17,11 +17,11 @@ plugins {
 }
 
 kotlin {
-    android {
+    androidTarget {
         publishAllLibraryVariants()
     }
     jvm()
-    js(BOTH) {
+    js {
         browser()
         nodejs()
     }
@@ -30,23 +30,18 @@ kotlin {
     macosArm64()
     iosX64()
     iosArm64()
-    iosArm32()
     iosSimulatorArm64()
     watchosArm32()
     watchosArm64()
     watchosSimulatorArm64()
     watchosDeviceArm64()
-    watchosX86()
     watchosX64()
     tvosArm64()
     tvosSimulatorArm64()
     tvosX64()
 
     mingwX64()
-    mingwX86()
     linuxX64()
-    linuxArm32Hfp()
-    linuxMips32()
 
     androidNativeArm32()
     androidNativeArm64()
@@ -75,7 +70,7 @@ kotlin {
     val androidMain by sourceSets.getting {
         dependsOn(commonJvmMain)
     }
-    val androidTest by sourceSets.getting {
+    val androidUnitTest by sourceSets.getting {
         dependsOn(androidMain)
         dependsOn(commonJvmTest)
     }
@@ -136,7 +131,7 @@ kotlin {
         implementation(libs.testhelp)
     }
 
-    androidTest.dependencies {
+    androidUnitTest.dependencies {
         implementation("org.jetbrains.kotlin:kotlin-test")
         implementation("org.jetbrains.kotlin:kotlin-test-junit")
         implementation("androidx.test:runner:1.4.0")
@@ -154,7 +149,6 @@ kotlin {
     }
 
     jsMain.dependencies {
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-js")
     }
 
     jsTest.dependencies {

diff --git a/kermit-core/src/commonTest/kotlin/co/touchlab/kermit/TestLogWriter.kt b/kermit-core/src/commonTest/kotlin/co/touchlab/kermit/TestLogWriter.kt
diff --git a/kermit-core/src/darwinMain/kotlin/co/touchlab/kermit/OSLogWriter.kt b/kermit-core/src/darwinMain/kotlin/co/touchlab/kermit/OSLogWriter.kt
@@ -10,6 +10,7 @@
 
 package co.touchlab.kermit
 
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.ptr
 import platform.darwin.OS_LOG_DEFAULT
 import platform.darwin.OS_LOG_TYPE_DEBUG
@@ -19,6 +20,7 @@ import platform.darwin.OS_LOG_TYPE_FAULT
 import platform.darwin.OS_LOG_TYPE_INFO
 import platform.darwin.__dso_handle
 import platform.darwin._os_log_internal
+import kotlin.experimental.ExperimentalNativeApi
 
 /**
  * Write log statements to darwin oslog.
@@ -49,6 +51,7 @@ open class OSLogWriter internal constructor(
         }
     }
 
+    @OptIn(ExperimentalNativeApi::class)
     open fun logThrowable(osLogSeverity: UByte, throwable: Throwable){
         darwinLogger.log(osLogSeverity, throwable.getStackTrace().joinToString("\n"))
     }
@@ -71,6 +74,7 @@ internal interface DarwinLogger {
 }
 
 private object DarwinLoggerActual : DarwinLogger {
+    @OptIn(ExperimentalForeignApi::class)
     override fun log(osLogSeverity: UByte, message: String) {
         _os_log_internal(
             __dso_handle.ptr,

diff --git a/kermit-core/src/darwinMain/kotlin/co/touchlab/kermit/XcodeSeverityWriter.kt b/kermit-core/src/darwinMain/kotlin/co/touchlab/kermit/XcodeSeverityWriter.kt
@@ -10,6 +10,8 @@
 
 package co.touchlab.kermit
 
+import kotlin.experimental.ExperimentalNativeApi
+
 /**
  * Development-focused LogWriter. Will write a colored emoji according to Severity, and write the Throwable stack trace
  * to println rather than oslog, as oslog will cut off long strings.
@@ -18,6 +20,7 @@ open class XcodeSeverityWriter(private val messageStringFormatter: MessageString
     override fun formatMessage(severity: Severity, tag: Tag, message: Message): String =
         "${emojiPrefix(severity)} ${messageStringFormatter.formatMessage(null, tag, message)}"
 
+    @OptIn(ExperimentalNativeApi::class)
     override fun logThrowable(osLogSeverity: UByte, throwable: Throwable) {
         // oslog cuts off longer strings, so for local development, println is more useful
         println(throwable.getStackTrace().joinToString("\n"))

diff --git a/kermit-core/src/nativeMain/kotlin/co/touchlab/kermit/KermitConfig.kt b/kermit-core/src/nativeMain/kotlin/co/touchlab/kermit/KermitConfig.kt
@@ -10,23 +10,22 @@
 
 package co.touchlab.kermit
 
-import kotlin.native.concurrent.AtomicReference
-import kotlin.native.concurrent.freeze
+import kotlin.concurrent.AtomicReference
 
 internal class AtomicMutableLoggerConfig(logWriters: List<LogWriter>) : MutableLoggerConfig {
     private val _minSeverity = AtomicReference(DEFAULT_MIN_SEVERITY)
-    private val _loggerList = AtomicReference(logWriters.freeze())
+    private val _loggerList = AtomicReference(logWriters)
 
     override var minSeverity: Severity
         get() = _minSeverity.value
         set(value) {
-            _minSeverity.value = value.freeze()
+            _minSeverity.value = value
         }
     override var logWriterList: List<LogWriter>
         get() = _loggerList.value
         set(value) {
-            _loggerList.value = value.freeze()
+            _loggerList.value = value
         }
 }
 
-actual fun mutableLoggerConfigInit(logWriters: List<LogWriter>): MutableLoggerConfig = AtomicMutableLoggerConfig(logWriters)
+actual fun mutableLoggerConfigInit(logWriters: List<LogWriter>): MutableLoggerConfig = AtomicMutableLoggerConfig(logWriters)