From e60ab72be4e5bda3fcd97593fa6a07e7d9920722 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 12 Jun 2024 12:37:41 +0200 Subject: [PATCH] Kotlin: Update to version 2.0.0 Including matching kotlinx-io version 0.4.0 and kotlin-wrappers version pre.757 --- .gitignore | 35 ++++++++----------- .gitignore-custom | 6 ++-- CHANGELOG.md | 3 ++ gradle.properties | 2 +- .../kotlin/saschpe/log4k/slf4j/SLF4JLogger.kt | 4 +-- log4k/build.gradle.kts | 4 +-- settings.gradle.kts | 2 +- 7 files changed, 26 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 5495277..291fb96 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,15 @@ # Custom ignore rules, update with: # { cat .gitignore-custom ; gibo dump Android Gradle JetBrains Kotlin macOS Vim } > .gitignore +**/pom.xml +*.jks .idea/artifacts .idea/libraries-with-intellij-classes.xml .idea/misc.xml -**/pom.xml -*.jks +.kotlin buildSrc/src/main/kotlin/Secrets.kt -kotlin-js-store ### Generated by gibo (https://github.com/simonwhitaker/gibo) -### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/Android.gitignore +### https://raw.github.com/github/gitignore/4488915eec0b3a45b5c63ead28f286819c0917de/Android.gitignore # Gradle files .gradle/ @@ -44,9 +44,8 @@ google-services.json # Android Profiling *.hprof - - -### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/Gradle.gitignore +### Generated by gibo (https://github.com/simonwhitaker/gibo) +### https://raw.github.com/github/gitignore/4488915eec0b3a45b5c63ead28f286819c0917de/Gradle.gitignore .gradle **/build/ @@ -69,9 +68,8 @@ gradle-app.setting .project # JDT-specific (Eclipse Java Development Tools) .classpath - - -### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/Global/JetBrains.gitignore +### Generated by gibo (https://github.com/simonwhitaker/gibo) +### https://raw.github.com/github/gitignore/4488915eec0b3a45b5c63ead28f286819c0917de/Global/JetBrains.gitignore # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 @@ -150,9 +148,8 @@ fabric.properties # Android studio 3.1+ serialized cache file .idea/caches/build_file_checksums.ser - - -### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/Kotlin.gitignore +### Generated by gibo (https://github.com/simonwhitaker/gibo) +### https://raw.github.com/github/gitignore/4488915eec0b3a45b5c63ead28f286819c0917de/Kotlin.gitignore # Compiled class file *.class @@ -178,9 +175,8 @@ fabric.properties # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* replay_pid* - - -### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/Global/macOS.gitignore +### Generated by gibo (https://github.com/simonwhitaker/gibo) +### https://raw.github.com/github/gitignore/4488915eec0b3a45b5c63ead28f286819c0917de/Global/macOS.gitignore # General .DS_Store @@ -208,9 +204,8 @@ Icon Network Trash Folder Temporary Items .apdisk - - -### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/Global/Vim.gitignore +### Generated by gibo (https://github.com/simonwhitaker/gibo) +### https://raw.github.com/github/gitignore/4488915eec0b3a45b5c63ead28f286819c0917de/Global/Vim.gitignore # Swap [._]*.s[a-v][a-z] @@ -231,5 +226,3 @@ Sessionx.vim tags # Persistent undo [._]*.un~ - - diff --git a/.gitignore-custom b/.gitignore-custom index c88d5d4..1c11736 100644 --- a/.gitignore-custom +++ b/.gitignore-custom @@ -1,10 +1,10 @@ # Custom ignore rules, update with: # { cat .gitignore-custom ; gibo dump Android Gradle JetBrains Kotlin macOS Vim } > .gitignore +**/pom.xml +*.jks .idea/artifacts .idea/libraries-with-intellij-classes.xml .idea/misc.xml -**/pom.xml -*.jks +.kotlin buildSrc/src/main/kotlin/Secrets.kt -kotlin-js-store diff --git a/CHANGELOG.md b/CHANGELOG.md index cae916e..c6cd0f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Use more unique (internal) content provider authorities. Avoids potential clashes in apps integrating the library - Dependency update: - [Gradle 8.8](https://docs.gradle.org/8.8/release-notes.html) + - [Kotlin 2.0.0](https://github.com/JetBrains/kotlin/releases/tag/v2.0.0) + - [kotlinx-io 0.4.0](https://github.com/Kotlin/kotlinx-io/releases/tag/0.4.0) + - [kotlin-wrappers pre.757](https://github.com/JetBrains/kotlin-wrappers/releases/tag/pre.757) ## [1.3.1] - 2024-05-22 - FileLogger: Remove constructor with `kotlinx.io.files.Path` diff --git a/gradle.properties b/gradle.properties index b1b1841..abf0fbf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,5 +6,5 @@ org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF org.gradle.parallel=true # Kotlin +kotlin.apple.xcodeCompatibility.nowarn=true kotlin.code.style=official -kotlin.mpp.stability.nowarn=true diff --git a/log4k-slf4j/src/androidMain/kotlin/saschpe/log4k/slf4j/SLF4JLogger.kt b/log4k-slf4j/src/androidMain/kotlin/saschpe/log4k/slf4j/SLF4JLogger.kt index 097ebb6..3e2b84f 100644 --- a/log4k-slf4j/src/androidMain/kotlin/saschpe/log4k/slf4j/SLF4JLogger.kt +++ b/log4k-slf4j/src/androidMain/kotlin/saschpe/log4k/slf4j/SLF4JLogger.kt @@ -7,8 +7,8 @@ import saschpe.log4k.Logger /** * Logger that forwards all log statements to SLF4J API. * - * SLF4J in turn allows to use Logback or other implementations. This way, you can use the expressive `logback.xml` - * configuration and appender. + * SLF4J in turn allows using Logback or other implementations. + * This way, you can use the expressive `logback.xml` configuration and appender. */ actual class SLF4JLogger : Logger() { override fun print(level: Log.Level, tag: String, message: String?, throwable: Throwable?) = diff --git a/log4k/build.gradle.kts b/log4k/build.gradle.kts index 3fea498..8e47217 100644 --- a/log4k/build.gradle.kts +++ b/log4k/build.gradle.kts @@ -21,13 +21,13 @@ kotlin { sourceSets { commonMain.dependencies { implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.0") - implementation("org.jetbrains.kotlinx:kotlinx-io-core:0.3.5") + implementation("org.jetbrains.kotlinx:kotlinx-io-core:0.4.0") } commonTest.dependencies { implementation(kotlin("test")) } jsMain.dependencies { - implementation("org.jetbrains.kotlin-wrappers:kotlin-node:20.11.30-pre.751") + implementation("org.jetbrains.kotlin-wrappers:kotlin-node:20.11.30-pre.757") } jsTest.dependencies { implementation(kotlin("test-js")) diff --git a/settings.gradle.kts b/settings.gradle.kts index 7b791d8..c6786f5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,7 +5,7 @@ pluginManagement { } plugins { - kotlin("multiplatform") version "1.9.23" + kotlin("multiplatform") version "2.0.0" id("com.android.library") version "8.2.2" id("org.jetbrains.dokka") version "1.9.20" }