Skip to content

Commit

Permalink
Update Kotlin version to 1.9.21 (#318)
Browse files Browse the repository at this point in the history
  • Loading branch information
FenstonSingel authored Nov 24, 2023
1 parent 2f6ade2 commit f97034f
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 429 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![JetBrains official project](https://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/kotlinx-datetime.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22org.jetbrains.kotlinx%22%20AND%20a:%22kotlinx-datetime%22)
[![Kotlin](https://img.shields.io/badge/kotlin-1.8.21-blue.svg?logo=kotlin)](http://kotlinlang.org)
[![Kotlin](https://img.shields.io/badge/kotlin-1.9.21-blue.svg?logo=kotlin)](http://kotlinlang.org)
[![KDoc link](https://img.shields.io/badge/API_reference-KDoc-blue)](https://kotlinlang.org/api/kotlinx-datetime/)
[![Slack channel](https://img.shields.io/badge/chat-slack-blue.svg?logo=slack)](https://kotlinlang.slack.com/messages/kotlinx-datetime/)
[![TeamCity build](https://img.shields.io/teamcity/build/s/KotlinTools_KotlinxDatetime_Build_All.svg?server=http%3A%2F%2Fteamcity.jetbrains.com)](https://teamcity.jetbrains.com/viewType.html?buildTypeId=KotlinTools_KotlinxDatetime_Build_All&guest=1)
Expand Down
3 changes: 0 additions & 3 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ kotlin {
target("iosArm64")
// Tier 3
target("watchosDeviceArm64")
// Deprecated for removal
target("iosArm32")
target("watchosX86")
}
}

Expand Down
3 changes: 3 additions & 0 deletions core/darwin/src/Converters.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
* Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
*/

@file:OptIn(kotlinx.cinterop.ExperimentalForeignApi::class, kotlinx.cinterop.UnsafeNumber::class)

package kotlinx.datetime

import kotlinx.cinterop.*
import platform.Foundation.*

Expand Down
2 changes: 2 additions & 0 deletions core/darwin/src/TimeZoneNative.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
* Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
*/

@file:OptIn(kotlinx.cinterop.UnsafeNumber::class)

package kotlinx.datetime

import platform.Foundation.*
Expand Down
1 change: 1 addition & 0 deletions core/darwin/test/ConvertersTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ class ConvertersTest {
assertEquals(str + "Z", dateFormatter.stringFromDate(nsDate))
}

@OptIn(kotlinx.cinterop.ExperimentalForeignApi::class)
private fun zoneOffsetCheck(timeZone: FixedOffsetTimeZone, hours: Int, minutes: Int) {
val nsTimeZone = timeZone.toNSTimeZone()
val kotlinTimeZone = nsTimeZone.toKotlinTimeZone()
Expand Down
3 changes: 3 additions & 0 deletions core/native/cinterop_actuals/TimeZoneNative.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
* Copyright 2019-2020 JetBrains s.r.o.
* Use of this source code is governed by the Apache 2.0 License that can be found in the LICENSE.txt file.
*/

@file:OptIn(kotlinx.cinterop.ExperimentalForeignApi::class)

package kotlinx.datetime

import kotlinx.datetime.internal.*
Expand Down
6 changes: 2 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,14 @@ group=org.jetbrains.kotlinx
version=0.4.1
versionSuffix=SNAPSHOT

defaultKotlinVersion=1.8.21
defaultKotlinVersion=1.9.21
dokkaVersion=1.8.20
serializationVersion=1.5.1

java.mainToolchainVersion=8
java.modularToolchainVersion=11

kotlin.mpp.stability.nowarn=true
kotlin.mpp.enableCompatibilityMetadataVariant=true
kotlin.js.compiler=both
kotlin.js.compiler=ir
kotlin.native.ignoreIncorrectDependencies=true
kotlin.native.ignoreDisabledTargets=true

Expand Down
432 changes: 13 additions & 419 deletions kotlin-js-store/yarn.lock

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions serialization/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@ kotlin {
target("macosArm64")
target("iosX64")
target("iosArm64")
target("iosArm32")
target("iosSimulatorArm64")
target("watchosArm32")
target("watchosArm64")
target("watchosX86")
target("watchosX64")
target("watchosSimulatorArm64")
target("watchosDeviceArm64")
Expand Down

0 comments on commit f97034f

Please sign in to comment.