From 44f920ffbf0261829ded8085f107d56443f45147 Mon Sep 17 00:00:00 2001 From: Gil Bahat Date: Wed, 25 Sep 2024 14:13:25 +0300 Subject: [PATCH 1/6] bump up jre version --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 72622b8a5..27354f9af 100644 --- a/build.gradle +++ b/build.gradle @@ -36,8 +36,8 @@ group = 'io.emeraldpay.dshackle' version = getVersion() java { - sourceCompatibility = JavaVersion.VERSION_20 - targetCompatibility = JavaVersion.VERSION_20 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } repositories { @@ -132,10 +132,10 @@ tasks.withType(Test) { jvmArgs += "--enable-preview" } tasks.withType(JavaExec) { jvmArgs += "--enable-preview" } compileKotlin { - compilerOptions.jvmTarget.set(JvmTarget.JVM_20) + compilerOptions.jvmTarget.set(JvmTarget.JVM_21) } compileTestKotlin { - compilerOptions.jvmTarget.set(JvmTarget.JVM_20) + compilerOptions.jvmTarget.set(JvmTarget.JVM_21) } test { From 081c114e17378dfa79469bc4b2e8ba3fd018e618 Mon Sep 17 00:00:00 2001 From: Gil Bahat Date: Wed, 25 Sep 2024 14:14:59 +0300 Subject: [PATCH 2/6] Update build.gradle --- foundation/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundation/build.gradle b/foundation/build.gradle index a378028f5..5828bb866 100644 --- a/foundation/build.gradle +++ b/foundation/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.jetbrains.kotlin.jvm' version '1.9.10' + id 'org.jetbrains.kotlin.jvm' version '1.9.25' id 'maven-publish' } From 0786c98b1fb16b2f847bc7fbc35cce5fbd81ad63 Mon Sep 17 00:00:00 2001 From: Gil Bahat Date: Wed, 25 Sep 2024 14:15:23 +0300 Subject: [PATCH 3/6] Update gradle-wrapper.properties --- foundation/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundation/gradle/wrapper/gradle-wrapper.properties b/foundation/gradle/wrapper/gradle-wrapper.properties index db9a6b825..a59520664 100644 --- a/foundation/gradle/wrapper/gradle-wrapper.properties +++ b/foundation/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 5e065b60b654b21159a5fa2a16aef0527b4adbd8 Mon Sep 17 00:00:00 2001 From: Gil Bahat Date: Wed, 25 Sep 2024 14:16:01 +0300 Subject: [PATCH 4/6] Update libs.versions.toml --- gradle/libs.versions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5727b18db..13270abc3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,9 +8,9 @@ reactive-grpc = "1.2.0" spring-boot = "2.6.15" spring-security = "5.5.3" reactor = "3.4.32" -netty = "4.1.97.Final" -netty-tcnative = "2.0.61.Final" -kotlin = "1.9.10" +netty = "4.1.113.Final" +netty-tcnative = "2.0.66.Final" +kotlin = "1.9.25" httpcomponents = "4.5.8" [libraries] @@ -143,4 +143,4 @@ spring = { id = "org.springframework.boot", version = "2.6.0" } git = { id = "com.palantir.git-version", version = "0.12.3" } protobuf = { id = "com.google.protobuf", version = "0.9.1" } ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.6.0" } -detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } \ No newline at end of file +detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } From 06beb7eddc6eedcac1b0a23eb982d4871fb5214c Mon Sep 17 00:00:00 2001 From: Gil Bahat Date: Wed, 25 Sep 2024 14:16:16 +0300 Subject: [PATCH 5/6] Update gradle-wrapper.properties --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index db9a6b825..a59520664 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 9295d59b90fc3609da3e4686f67a04fae2e14be9 Mon Sep 17 00:00:00 2001 From: Gil Bahat Date: Thu, 26 Sep 2024 16:12:42 +0300 Subject: [PATCH 6/6] Update build.gradle add aarch build target --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 27354f9af..3a410dc02 100644 --- a/build.gradle +++ b/build.gradle @@ -119,6 +119,7 @@ dependencies { implementation(variantOf(libs.netty.tcnative.boringssl) { classifier("osx-aarch_64") }) implementation(variantOf(libs.netty.tcnative.boringssl) { classifier("linux-x86_64") }) + implementation(variantOf(libs.netty.tcnative.boringssl) { classifier("linux-aarch64") }) implementation(variantOf(libs.netty.tcnative.boringssl) { classifier("osx-x86_64") }) implementation 'dshackle:foundation:1.0.0'