Skip to content

Commit 4eae66f

Browse files
committed
bump Kotlin version to 2.0.21, bump JDK version to 22.0.2, bump Vert.x, Ebean and other lib versions
1 parent a982d44 commit 4eae66f

File tree

11 files changed

+35
-40
lines changed

11 files changed

+35
-40
lines changed

build.gradle

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
ext {
22
version = project.property('version')
33

4-
kotlinVersion = "2.0.20-Beta1"
5-
vertxVersion = '4.5.8'
6-
pebbleVersion = '3.2.2'
4+
kotlinVersion = "2.0.21"
5+
vertxVersion = '4.5.10'
6+
pebbleVersion = '3.2.1'
77

8-
coroutineVersion = "1.9.0-RC"
8+
coroutineVersion = "1.9.0"
99
arrowVersion = "0.7.2"
10-
detektVersion = "1.23.6"
10+
detektVersion = "1.23.7"
1111

12-
logbackVersion = '1.5.6'
13-
logstashLogbackEncoderVersion = '7.4'
12+
logbackVersion = '1.5.12'
13+
logstashLogbackEncoderVersion = '8.0'
1414

15-
commonsLangVersion = '3.13.0'
16-
commonsIOVersion = '2.13.0'
17-
commonsCodecVersion = '1.16.0'
15+
commonsLangVersion = '3.17.0'
16+
commonsIOVersion = '2.17.0'
17+
commonsCodecVersion = '1.17.1'
1818

19-
daggerVersion = '2.51.1'
20-
jacksonVersion = '2.17.1'
19+
daggerVersion = '2.52'
20+
jacksonVersion = '2.18.1'
2121
morphiaVersion = '1.3.2'
22-
quartzVersion = "2.5.0-rc1"
22+
quartzVersion = "2.5.0-rc2"
2323

2424
jakartaElVersion = '4.0.2'
25-
hibernateValidatorVersion = '8.0.1.Final'
25+
hibernateValidatorVersion = '9.0.0.Beta3'
2626
elImplVersion = "2.2"
2727

2828
jBCryptVersion = '0.4.1'
2929
guavaVersion = '23.5-jre'
3030
asciiTableVersion = '0.3.2'
3131

32-
ebeanVersion = "15.4.0"
32+
ebeanVersion = "15.8.0"
3333
ebeanAutotuneVersion = "14.0.0"
3434
jdbiVersion = "3.39.1"
35-
hikariCPVersion = "5.1.0"
36-
flywayVersion = "10.15.0"
35+
hikariCPVersion = "6.0.0"
36+
flywayVersion = "10.20.1"
3737

3838
restAssuredVersion = '5.3.1'
3939
embeddedMongoVersion = '2.0.0'

buildSrc/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ plugins {
55
id 'groovy-gradle-plugin'
66
}
77

8-
def kotlinVersion = '2.0.20-Beta1'
9-
def detektVersion = '1.23.6'
8+
def kotlinVersion = '2.0.21'
9+
def detektVersion = '1.23.7'
1010

1111
repositories {
1212
// Use the plugin portal to apply community plugins in convention plugins.

buildSrc/src/main/groovy/yoframework.kotlin-common-conventions.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ dependencies {
5959
}
6060

6161
kotlin {
62-
jvmToolchain(21)
62+
jvmToolchain(22)
6363
}
6464

6565
tasks {
@@ -101,7 +101,7 @@ tasks {
101101
}
102102

103103
jacoco {
104-
toolVersion = "0.8.11"
104+
toolVersion = "0.8.12"
105105
}
106106

107107
jacocoTestReport {
@@ -140,7 +140,7 @@ artifacts {
140140
}
141141

142142
detekt {
143-
toolVersion = "1.23.6"
143+
toolVersion = "1.23.7"
144144
input = files("src/main/kotlin")
145145
buildUponDefaultConfig = true
146146
parallel = true
@@ -155,7 +155,7 @@ detekt {
155155
sarif.enabled = false
156156
}
157157
}
158-
tasks.detekt.jvmTarget = "17"
158+
tasks.detekt.jvmTarget = "21"
159159

160160
def pomConfig = {
161161
name = "Yo Framework"

ebean/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
// Apply the db convention plugin for shared build configuration between module / subprojects.
33
id 'yoframework.kotlin-db-conventions'
4-
id 'io.ebean' version '15.5.0'
4+
id 'io.ebean' version '15.8.0'
55
}
66

77
dependencies {

ensure-java-21

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if [ "$JV" != 21 ]; then
99
echo "Installing sdkman..."
1010
curl -s "https://get.sdkman.io" | bash
1111
source ~/.sdkman/bin/sdkman-init.sh
12-
sdk install java 21.0.1-zulu
12+
sdk install java 21.0.5-zulu
1313
;;
1414
use)
1515
echo "must source ~/.sdkman/bin/sdkman-init.sh"

ensure-java-17 renamed to ensure-java-22

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#!/bin/bash
22

3-
JV=$(java -version 2>&1 >/dev/null | head -1)
4-
echo "$JV" | sed -E 's/^.*version "([^".]*)\.[^"]*".*$/\1/'
3+
JV=`java -version 2>&1 >/dev/null | head -1`
4+
echo $JV | sed -E 's/^.*version "([^".]*)\.[^"]*".*$/\1/'
55

6-
if [ "$JV" != 11 ]; then
6+
if [ "$JV" != 22 ]; then
77
case "$1" in
88
install)
99
echo "Installing sdkman..."
1010
curl -s "https://get.sdkman.io" | bash
1111
source ~/.sdkman/bin/sdkman-init.sh
12-
sdk install java 18.0.1-zulu
12+
sdk install java 22.0.2-zulu
1313
;;
1414
use)
1515
echo "must source ~/.sdkman/bin/sdkman-init.sh"

extra/src/test/kotlin/id/yoframework/extra/extension/pebble/PebbleSpec.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ object PebbleSpec : Spek({
6868
}
6969

7070
it("should able to compile file template") {
71-
val randomSuffix = RandomStringUtils.randomAlphabetic(12)
71+
val randomSuffix = RandomStringUtils.secureStrong()
7272
val location = "${tmpDir()}/test_template-$randomSuffix.peb"
7373
val templateString =
7474
"""

extra/src/test/kotlin/id/yoframework/extra/extension/pebble/TemplateSpec.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ object TemplateSpec : Spek({
4343
}
4444

4545
on("handling file template") {
46-
val randomSuffix = RandomStringUtils.randomAlphabetic(12)
46+
val randomSuffix = RandomStringUtils.secureStrong()
4747
val location = "${tmpDir()}/test_template-$randomSuffix.peb"
4848
val templateString =
4949
"""

gradle.properties

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Set the project version
2-
version=0.6
2+
version=0.7
33

44
# Enable K2 for KAPT compiler plugin
55
kapt.use.k2=true
@@ -19,7 +19,4 @@ org.gradle.parallel=true
1919
# Enable configure on demand
2020
org.gradle.configureondemand=true
2121

22-
# Enable new incremental compilation
23-
kotlin.incremental.useClasspathSnapshot=true
24-
2522
kapt.include.compile.classpath=false
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.9-rc-1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)