Skip to content

Commit

Permalink
Kotlin: Update to version 2.0.0
Browse files Browse the repository at this point in the history
Including matching kotlinx-io version 0.4.0 and kotlin-wrappers version
pre.757
  • Loading branch information
saschpe committed Jun 12, 2024
1 parent bf75857 commit e60ab72
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 30 deletions.
35 changes: 14 additions & 21 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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/
Expand Down Expand Up @@ -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/
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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]
Expand All @@ -231,5 +226,3 @@ Sessionx.vim
tags
# Persistent undo
[._]*.un~


Expand Down
6 changes: 3 additions & 3 deletions .gitignore-custom
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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?) =
Expand Down
4 changes: 2 additions & 2 deletions log4k/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down

0 comments on commit e60ab72

Please sign in to comment.