v1.5.0 Support for Kotlin 1.9.24

DiamondEdge1 · Jun 19, 2024 · 8e8dc54 · 8e8dc54
1 parent 53316ea
commit 8e8dc54
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -149,6 +149,7 @@ KmLogging.setLoggers(PlatformLogger(FixedLogLevel(BuildConfig.DEBUG)))
 
 | KmLogging version | Kotlin version |
 |-------------------|----------------|
+| 1.5.0             | 1.9.24         |
 | 1.4.2             | 1.8.22         |
 | 1.3.0             | 1.8.10         |
 | 1.2.1             | 1.7.21         |

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,8 +5,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22")
-        classpath("com.android.tools.build:gradle:8.0.2")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
+        classpath("com.android.tools.build:gradle:8.1.0")
         classpath("com.google.gms:google-services:4.4.1")
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.9")
     }

diff --git a/gradle.properties b/gradle.properties
@@ -17,4 +17,5 @@ licenseUrl=http://www.apache.org/licenses/LICENSE-2.0
 allLicenses=["Apache-2.0"]
 # workaround bug in webpack 5 usage
 #kotlin.js.webpack.major.version=4
-kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.js.yarn=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Feb 28 19:32:34 MST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     id("com.android.library")
     kotlin("multiplatform")
     id("org.jetbrains.dokka")
-    id("com.vanniktech.maven.publish") version "0.27.0"
+    id("com.vanniktech.maven.publish") version "0.28.0"
 }
 
 kotlin {
@@ -77,7 +77,7 @@ tasks {
 }
 
 extra["artifactId"] = "logging"
-extra["artifactVersion"] = "1.4.2"
+extra["artifactVersion"] = "1.5.0"
 extra["libraryName"] = "KmLogging: Kotlin Multiplatform Logging"
 extra["libraryDescription"] = "KmLogging is a high performance, extensible and easy to use logging library for Kotlin Multiplatform development"
 extra["gitUrl"] = "https://github.com/LighthouseGames/KmLogging"

diff --git a/logging/src/commonMain/kotlin/org/lighthousegames/logging/KmLogging.kt b/logging/src/commonMain/kotlin/org/lighthousegames/logging/KmLogging.kt
@@ -1,13 +1,10 @@
 package org.lighthousegames.logging
 
 import co.touchlab.stately.concurrency.AtomicReference
-import kotlin.native.concurrent.SharedImmutable
 import kotlin.native.concurrent.ThreadLocal
 
-@SharedImmutable
 internal val logFactory: AtomicReference<LogFactory?> = AtomicReference(null)
 
-@SharedImmutable
 private val loggers: AtomicReference<List<Logger>> = AtomicReference(emptyList())
 
 @ThreadLocal

diff --git a/logging/src/iosMain/kotlin/org/lighthousegames/logging/PlatformLogger.kt b/logging/src/iosMain/kotlin/org/lighthousegames/logging/PlatformLogger.kt
@@ -1,5 +1,6 @@
 package org.lighthousegames.logging
 
+import kotlinx.cinterop.ExperimentalForeignApi
 import kotlinx.cinterop.ptr
 import platform.Foundation.NSThread
 import platform.darwin.OS_LOG_DEFAULT
@@ -11,6 +12,7 @@ import platform.darwin.OS_LOG_TYPE_INFO
 import platform.darwin.__dso_handle
 import platform.darwin._os_log_internal
 
+@OptIn(ExperimentalForeignApi::class)
 actual class PlatformLogger actual constructor(actual val logLevel: LogLevelController) : Logger, TagProvider, LogLevelController by logLevel {
 
     actual override fun verbose(tag: String, msg: String) {

diff --git a/sample/shared/build.gradle.kts b/sample/shared/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 kotlin {
-    android()
+    androidTarget()
     listOf(
         iosX64(),
         iosArm64(),

diff --git a/sample/webApp/build.gradle.kts b/sample/webApp/build.gradle.kts
@@ -1,20 +1,18 @@
 plugins {
-    kotlin("js")
-}
-
-dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-html:0.7.3")
-    implementation(project(":sample:shared"))
+    kotlin("multiplatform")
 }
 
 kotlin {
-    js(IR) {
+    js {
         browser {
-            binaries.executable()
-            commonWebpackConfig {
-                cssSupport {
-                    enabled.set(true)
-                }
+        }
+        binaries.executable()
+    }
+    sourceSets {
+        val jsMain by getting {
+            dependencies {
+                implementation("org.jetbrains.kotlinx:kotlinx-html:0.8.0")
+                implementation(project(":sample:shared"))
             }
         }
     }

diff --git a/sample/webApp/src/main/kotlin/main.kt → sample/webApp/src/jsMain/kotlin/main.kt b/sample/webApp/src/main/kotlin/main.kt → sample/webApp/src/jsMain/kotlin/main.kt
diff --git a/sample/webApp/src/main/resources/index.html → ...le/webApp/src/jsMain/resources/index.html b/sample/webApp/src/main/resources/index.html → ...le/webApp/src/jsMain/resources/index.html
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -4,8 +4,8 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        id("org.jetbrains.dokka") version "1.9.10"
-        kotlin("multiplatform") version "1.9.20"
+        id("org.jetbrains.dokka") version "1.9.20"
+        kotlin("multiplatform") version "1.9.24"
     }
 }