Skip to content

Commit

Permalink
fix jdk 21
Browse files Browse the repository at this point in the history
  • Loading branch information
napoly committed Mar 9, 2024
1 parent f657157 commit f509bc3
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
with:
submodules: recursive

- name: Set up JDK 11
uses: actions/setup-java@v3
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '11'
java-version: '21'

- name: Build with Gradle
run: ./gradlew clean build --stacktrace --scan
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ application {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(11))
languageVersion.set(JavaLanguageVersion.of(21))
}
}

Expand Down Expand Up @@ -67,6 +67,7 @@ dependencies {
testCompileOnly libs.lombok
testImplementation libs.junit.jupiter
testImplementation libs.mockito.core
testImplementation libs.byte.buddy
}

clean.doFirst {
Expand Down
8 changes: 5 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
# Convention: mark all versions using 'strictly'. This ensures only one version is allowed in the dependency tree, even
# when multiple versions are attempted to be brought in as transitive dependencies of other requirements.
[versions]
junit-jupiter-lib = { strictly = '5.8.2' }
junit-jupiter-lib = { strictly = '5.9.2' }
knowm-xchange-lib = { strictly = '5.0.13' }
logback-lib = { strictly = '1.2.6' }
lombok-lib = { strictly = '1.18.22' }
mockito-lib = { strictly = '4.0.0' }
lombok-lib = { strictly = '1.18.30' }
mockito-lib = { strictly = '5.10.0' }
buddy-lib = { strictly = '1.14.11' }
slf4j-lib = { strictly = '1.7.36' }
spring-dependency-management-plugin-lib = { strictly = '1.0.12.RELEASE' }
spring-plugin-lib = { strictly = '2.5.6' }
Expand All @@ -35,6 +36,7 @@ logback-core = { module = 'ch.qos.logback:logback-core', version.ref = 'logback-
logback-classic = { module = 'ch.qos.logback:logback-classic', version.ref = 'logback-lib' }
lombok = { module = 'org.projectlombok:lombok', version.ref = 'lombok-lib' }
mockito-core = { module = 'org.mockito:mockito-core', version.ref = 'mockito-lib' }
byte-buddy = { module = 'net.bytebuddy:byte-buddy', version.ref = 'buddy-lib' }
slf4j-api = { module = 'org.slf4j:slf4j-api', version.ref = 'slf4j-lib' }
spring-dependency-management-plugin = { module = 'io.spring.gradle:dependency-management-plugin', version.ref = 'spring-dependency-management-plugin-lib' }
spring-boot-starter-web = { module = 'org.springframework.boot:spring-boot-starter-web', version.ref = 'spring-boot-starter-web-lib' }
Expand Down
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion scripts/install_pricenode_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt-get update -q
sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt-get upgrade -qq -y

echo "[*] Installing Haveno dependencies"
sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt install -qq -y make wget git openjdk-11-jdk
sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt install -qq -y make wget git openjdk-21-jdk

echo "[*] Installing Tor"
sudo -H -i -u "${ROOT_USER}" DEBIAN_FRONTEND=noninteractive apt-get install -qq -y "${TOR_PKG}"
Expand Down

0 comments on commit f509bc3

Please sign in to comment.