StakeSquid/dshackle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update java/kotlin (#611)

Browse Source
This commit is contained in:
KirillPamPam
2024-12-25 15:36:56 +04:00
committed by GitHub
parent 42da48be5f
commit 7832c1be0e
8 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/publish.yaml vendored
View File

@@ -16,7 +16,7 @@ jobs:
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
distribution: 'zulu' distribution: 'zulu'
java-version: 20 java-version: 21
- name: Setup gradle - name: Setup gradle
uses: gradle/gradle-build-action@v2 uses: gradle/gradle-build-action@v2
- name: Upload to Docker - name: Upload to Docker
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
distribution: 'zulu' distribution: 'zulu'
java-version: 20 java-version: 21
- name: Setup gradle - name: Setup gradle
uses: gradle/gradle-build-action@v2 uses: gradle/gradle-build-action@v2
- name: Build zip - name: Build zip

2
.github/workflows/test.yaml vendored
View File

@@ -31,7 +31,7 @@ jobs:
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
distribution: 'zulu' distribution: 'zulu'
java-version: 20 java-version: 21
- name: Install System Libs - name: Install System Libs
run: sudo apt-get install -y openssl libapr1 run: sudo apt-get install -y openssl libapr1

2
Dockerfile
View File

@@ -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 RUN apt-get update -y && apt-get install -y libcurl4-openssl-dev libcjson-dev

9
build.gradle
View File

@@ -36,8 +36,8 @@ group = 'io.emeraldpay.dshackle'
version = getVersion() version = getVersion()
java { java {
sourceCompatibility = JavaVersion.VERSION_20 sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_20 targetCompatibility = JavaVersion.VERSION_21
} }
repositories { repositories {
@@ -119,6 +119,7 @@ dependencies {
implementation(variantOf(libs.netty.tcnative.boringssl) { classifier("osx-aarch_64") }) 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-x86_64") })
implementation(variantOf(libs.netty.tcnative.boringssl) { classifier("linux-aarch_64") })
implementation(variantOf(libs.netty.tcnative.boringssl) { classifier("osx-x86_64") }) implementation(variantOf(libs.netty.tcnative.boringssl) { classifier("osx-x86_64") })
implementation 'dshackle:foundation:1.0.0' implementation 'dshackle:foundation:1.0.0'
@@ -132,10 +133,10 @@ tasks.withType(Test) { jvmArgs += "--enable-preview" }
tasks.withType(JavaExec) { jvmArgs += "--enable-preview" } tasks.withType(JavaExec) { jvmArgs += "--enable-preview" }
compileKotlin { compileKotlin {
compilerOptions.jvmTarget.set(JvmTarget.JVM_20) compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
} }
compileTestKotlin { compileTestKotlin {
compilerOptions.jvmTarget.set(JvmTarget.JVM_20) compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
} }
test { test {

2
foundation/build.gradle
View File

@@ -1,5 +1,5 @@
plugins { plugins {
id 'org.jetbrains.kotlin.jvm' version '1.9.10' id 'org.jetbrains.kotlin.jvm' version '1.9.25'
id 'maven-publish' id 'maven-publish'
} }

2
foundation/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

6
gradle/libs.versions.toml
View File

@@ -8,9 +8,9 @@ reactive-grpc = "1.2.0"
spring-boot = "2.6.15" spring-boot = "2.6.15"
spring-security = "5.5.3" spring-security = "5.5.3"
reactor = "3.4.32" reactor = "3.4.32"
netty = "4.1.97.Final" netty = "4.1.113.Final"
netty-tcnative = "2.0.61.Final" netty-tcnative = "2.0.66.Final"
kotlin = "1.9.10" kotlin = "1.9.25"
httpcomponents = "4.5.8" httpcomponents = "4.5.8"
[libraries] [libraries]

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists