Skip to content

Commit add3ba3

Browse files
committed
Update Kotlin to 1.9.24, Gradle to 8.8 and toolchain settings
1 parent f671ec6 commit add3ba3

9 files changed

Lines changed: 38 additions & 9 deletions

File tree

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ repositories {
2121
Add the following dependency in order to access `CodifiedEnum` class.
2222

2323
```kotlin
24-
implementation("dev.bright.codified:enums:1.8.22.2")
24+
implementation("dev.bright.codified:enums:1.9.24.1")
2525
```
2626

2727
`CodifiedEnum` is a sealed class which represents either "known" or "unknown" enum type depending on the `code`
@@ -60,7 +60,7 @@ Add the following dependency in order to access `CodifiedEnum` serializer using
6060
[Kotlin serialization](https://github.com/Kotlin/kotlinx.serialization).
6161

6262
```kotlin
63-
implementation("dev.bright.codified:enums-serializer:1.8.22.2")
63+
implementation("dev.bright.codified:enums-serializer:1.9.24.1")
6464
```
6565

6666
Add `CodifiedSerializer` object for your enum class to handle both known and unknown enum types.
@@ -110,7 +110,7 @@ data class FoodBasket(
110110
Add this dependency:
111111

112112
```kotlin
113-
implementation("dev.bright.codified:enums-gson:1.8.22.2")
113+
implementation("dev.bright.codified:enums-gson:1.9.24.1")
114114
```
115115

116116
and register the `TypeAdapterFactory` for `CodifiedEnum`:

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
kotlin("jvm") version Versions.kotlin
2+
kotlin("jvm")
33
id("default-config")
44
id("default-java-publish")
55
}

buildSrc/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ plugins {
66
`kotlin-dsl`
77
`kotlin-dsl-precompiled-script-plugins`
88
}
9+
10+
dependencies {
11+
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
12+
}

buildSrc/src/main/kotlin/Config.kt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
import org.gradle.api.JavaVersion
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
3+
14
object Config {
25
val group = "dev.bright.codified"
3-
val version = "1.8.22.2"
4-
val jvmToolchain = 8
6+
val version = "1.9.24.1"
7+
8+
/**
9+
* Since Gradle 8.8 a toolchain can also be set for the Gradle daemon (with some limitations)
10+
* See [the docs](https://docs.gradle.org/8.8/userguide/gradle_daemon.html#sec:daemon_jvm_criteria) for more info
11+
*/
12+
val jvmToolchain = 21
13+
val javaTargetCompatibility = JavaVersion.VERSION_1_8
14+
val kotlinJvmTarget = JvmTarget.fromTarget(javaTargetCompatibility.toString())
515
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
object Versions {
2-
const val kotlin = "1.8.22"
2+
const val kotlin = "1.9.24" // Keep in sync with buildSrc/build.gradle.kts
33
const val junit = "5.6.2"
44
const val shouldko = "0.2.2"
5-
const val serialization = "1.5.1"
5+
const val serialization = "1.6.3"
66
const val jackson = "2.15.2"
77
const val gson = "2.10.1"
88
}

buildSrc/src/main/kotlin/default-config.gradle.kts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
plugins {
22
`java-library`
3+
kotlin("jvm")
34
}
45

56
java {
67
toolchain {
78
languageVersion.set(JavaLanguageVersion.of(Config.jvmToolchain))
89
}
10+
sourceCompatibility = Config.javaTargetCompatibility
11+
targetCompatibility = Config.javaTargetCompatibility
12+
}
13+
14+
kotlin {
15+
compilerOptions {
16+
jvmTarget = Config.kotlinJvmTarget
17+
}
918
}
1019

1120
tasks.withType<Test> {
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#This file is generated by updateDaemonJvm
2+
toolchainVersion=21
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

settings.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
plugins {
2+
id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
3+
}
4+
15
rootProject.name = "codified"
26
include("enums")
37
include("enums-serializer")

0 commit comments

Comments
 (0)