Skip to content

Commit

Permalink
chore: update kotlin and gradle versions
Browse files Browse the repository at this point in the history
  • Loading branch information
esensar committed Sep 22, 2024
1 parent 996c692 commit aeb0c3d
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 44 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,5 @@ gradle-app.setting

# Cache of project
.gradletasknamecache
.kotlin
kotlin-js-store/
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).

## [Unreleased]
- Updated kotlin version to `2.0.20`
- Updated `kotlinx.serialization` version to `1.7.3`

## [0.5.5] - 2023-04-29
- Removed redundant call to serialize in BaseMsgPackExtensionSerializer ([#92][i92] and [#95][p95])
Expand Down
10 changes: 5 additions & 5 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
object Dependencies {
object Versions {
const val kotlin = "1.8.10"
const val serialization = "1.4.0"
const val datetime = "0.4.0"
const val ktlintGradle = "10.2.0"
const val dokkaGradle = "1.5.0"
const val kotlin = "2.0.20"
const val serialization = "1.7.3"
const val datetime = "0.6.1"
const val ktlintGradle = "12.1.1"
const val dokkaGradle = "1.9.20"
}
}
2 changes: 0 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ kotlin.code.style=official
kotlin.incremental.multiplatform=true
kotlin.js.generate.executable.default=false
kotlin.js.compiler=both
kotlin.mpp.enableGranularSourceSetsMetadata=true
kotlin.native.enableDependencyPropagation=false
kotlin.native.ignoreDisabledTargets=true

org.gradle.vfs.watch=true
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
25 changes: 13 additions & 12 deletions serialization-msgpack-timestamp-extension/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ plugins {
}

kotlin {
jvm {
compilations.all {
kotlinOptions.jvmTarget = "1.8"
}
}
jvm()
js {
browser {
testTask {
Expand All @@ -21,10 +17,15 @@ kotlin {
}
}
}
ios()
applyDefaultHierarchyTemplate()
jvm()
iosX64()
iosArm64()
iosSimulatorArm64()
tvos()
watchos()
tvosX64()
tvosArm64()
watchosX64()
watchosArm64()
macosX64()
macosArm64()
mingwX64()
Expand All @@ -39,24 +40,24 @@ kotlin {
languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi")
}

val commonMain by getting {
commonMain {
dependencies {
implementation(project(":serialization-msgpack"))
implementation(kotlinx("datetime", Dependencies.Versions.datetime))
}
}
val commonTest by getting {
commonTest {
dependencies {
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
}
}
val jvmTest by getting {
jvmTest {
dependencies {
implementation(kotlin("test-junit"))
}
}
val jsTest by getting {
jsTest {
dependencies {
implementation(kotlin("test-js"))
}
Expand Down
25 changes: 13 additions & 12 deletions serialization-msgpack-unsigned-support/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@ plugins {
}

kotlin {
jvm {
compilations.all {
kotlinOptions.jvmTarget = "1.8"
}
}
jvm()
js {
browser {
testTask {
Expand All @@ -21,10 +17,15 @@ kotlin {
}
}
}
ios()
applyDefaultHierarchyTemplate()
jvm()
iosX64()
iosArm64()
iosSimulatorArm64()
tvos()
watchos()
tvosX64()
tvosArm64()
watchosX64()
watchosArm64()
macosX64()
macosArm64()
mingwX64()
Expand All @@ -39,23 +40,23 @@ kotlin {
languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi")
}

val commonMain by getting {
commonMain {
dependencies {
implementation(project(":serialization-msgpack"))
}
}
val commonTest by getting {
commonTest {
dependencies {
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
}
}
val jvmTest by getting {
jvmTest {
dependencies {
implementation(kotlin("test-junit"))
}
}
val jsTest by getting {
jsTest {
dependencies {
implementation(kotlin("test-js"))
}
Expand Down
24 changes: 12 additions & 12 deletions serialization-msgpack/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ plugins {
}

kotlin {
jvm {
compilations.all {
kotlinOptions.jvmTarget = "1.8"
}
}
js {
browser {
testTask {
Expand All @@ -21,10 +16,15 @@ kotlin {
}
}
}
ios()
applyDefaultHierarchyTemplate()
jvm()
iosX64()
iosArm64()
iosSimulatorArm64()
tvos()
watchos()
tvosX64()
tvosArm64()
watchosX64()
watchosArm64()
macosX64()
macosArm64()
mingwX64()
Expand All @@ -39,23 +39,23 @@ kotlin {
languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi")
}

val commonMain by getting {
commonMain {
dependencies {
api(kotlinxSerialization("core"))
}
}
val commonTest by getting {
commonTest {
dependencies {
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
}
}
val jvmTest by getting {
jvmTest {
dependencies {
implementation(kotlin("test-junit"))
}
}
val jsTest by getting {
jsTest {
dependencies {
implementation(kotlin("test-js"))
}
Expand Down

0 comments on commit aeb0c3d

Please sign in to comment.