From 7832c1be0e4b6ffb8f4eaf96a04ef87b806085ee Mon Sep 17 00:00:00 2001
From: KirillPamPam <kirill.mai308@gmail.com>
Date: Wed, 25 Dec 2024 15:36:56 +0400
Subject: [PATCH] Update java/kotlin (#611)

---
 .github/workflows/publish.yaml                      | 4 ++--
 .github/workflows/test.yaml                         | 2 +-
 Dockerfile                                          | 2 +-
 build.gradle                                        | 9 +++++----
 foundation/build.gradle                             | 2 +-
 foundation/gradle/wrapper/gradle-wrapper.properties | 2 +-
 gradle/libs.versions.toml                           | 6 +++---
 gradle/wrapper/gradle-wrapper.properties            | 2 +-
 8 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 90713ccc..d7df5fb4 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 20
+          java-version: 21
       - name: Setup gradle
         uses: gradle/gradle-build-action@v2
       - name: Upload to Docker
@@ -36,7 +36,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 20
+          java-version: 21
       - name: Setup gradle
         uses: gradle/gradle-build-action@v2
       - name: Build zip
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index e4833d84..f2a3139a 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 20
+          java-version: 21
 
       - name: Install System Libs
         run: sudo apt-get install -y openssl libapr1
diff --git a/Dockerfile b/Dockerfile
index 8765516a..ec474205 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,3 @@
-FROM eclipse-temurin:20
+FROM eclipse-temurin:21
 
 RUN apt-get update -y && apt-get install -y libcurl4-openssl-dev libcjson-dev
diff --git a/build.gradle b/build.gradle
index 72622b8a..d23b1c3e 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 {
@@ -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-aarch_64") })
     implementation(variantOf(libs.netty.tcnative.boringssl) { classifier("osx-x86_64") })
     implementation 'dshackle:foundation:1.0.0'
 
@@ -132,10 +133,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 {
diff --git a/foundation/build.gradle b/foundation/build.gradle
index a378028f..5828bb86 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'
 }
 
diff --git a/foundation/gradle/wrapper/gradle-wrapper.properties b/foundation/gradle/wrapper/gradle-wrapper.properties
index db9a6b82..a5952066 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
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5727b18d..d3b1bbb3 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]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index db9a6b82..a5952066 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