Skip to content

Commit

Permalink
move to java 20
Browse files Browse the repository at this point in the history
  • Loading branch information
a10zn8 committed Sep 22, 2023
1 parent 34d5592 commit 7f5f9c1
Show file tree
Hide file tree
Showing 7 changed files with 168 additions and 156 deletions.
33 changes: 6 additions & 27 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import io.gitlab.arturbosch.detekt.Detekt

import java.time.Instant
import java.time.ZoneId
import java.time.format.DateTimeFormatter
Expand Down Expand Up @@ -27,7 +25,6 @@ plugins {
alias(libs.plugins.git)
alias(libs.plugins.protobuf)
alias(libs.plugins.ktlint)
alias(libs.plugins.detekt)
}


Expand All @@ -36,8 +33,8 @@ group = 'io.emeraldpay.dshackle'
version = getVersion()

java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_20
targetCompatibility = JavaVersion.VERSION_20
}

repositories {
Expand Down Expand Up @@ -119,21 +116,19 @@ dependencies {
}
testImplementation libs.grpc.testing

detektPlugins libs.detekt.formatting

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("osx-x86_64") })
}

compileKotlin {
kotlinOptions {
jvmTarget = "17"
jvmTarget = "20"
}
}
compileTestKotlin {
kotlinOptions {
jvmTarget = "17"
jvmTarget = "20"
}
}

Expand Down Expand Up @@ -166,7 +161,7 @@ application {

jib {
from {
image = 'openjdk:17'
image = 'openjdk:20'
}
to {
// by default publish as:
Expand Down Expand Up @@ -301,23 +296,7 @@ jacocoTestReport {
}
}
jacoco {
toolVersion = "0.8.7"
}

detekt {
toolVersion = "1.22.0"
parallel = false
basePath = projectDir
debug = false
ignoreFailures = true
}

tasks.withType(Detekt).configureEach {
reports {
xml.outputLocation.set(file("build/reports/detekt/detekt.xml"))
html.outputLocation.set(file("build/reports/detekt/detekt.html"))
}
jvmTarget = "17"
toolVersion = "0.8.9"
}

static def getVersion() {
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
detekt = "1.22.0"
detekt = "1.23.1"
etherjar = "0.11.1"
groovy = "3.0.9"
groovy = "4.0.15"
protoc = "3.21.7"
jackson = "2.11.0"
grpc = "1.57.0"
Expand All @@ -11,7 +11,7 @@ spring-security = "5.5.3"
reactor = "3.4.32"
netty = "4.1.97.Final"
netty-tcnative = "2.0.61.Final"
kotlin = "1.7.20"
kotlin = "1.9.10"
httpcomponents = "4.5.8"

[libraries]
Expand Down Expand Up @@ -46,7 +46,7 @@ etherjar-tx = { module = "io.emeraldpay.etherjar:etherjar-tx", version.ref = "et
etherjar-contract = { module = "io.emeraldpay.etherjar:etherjar-contract", version.ref = "etherjar" }
etherjar-erc20 = { module = "io.emeraldpay.etherjar:etherjar-erc20", version.ref = "etherjar" }

groovy = { module = "org.codehaus.groovy:groovy", version.ref = "groovy" }
groovy = { module = "org.apache.groovy:groovy", version.ref = "groovy" }

grpc-proto-util = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protoc" }
grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" }
Expand Down Expand Up @@ -107,7 +107,7 @@ reactor-grpc-stub = "com.salesforce.servicelibs:reactor-grpc-stub:1.2.0"

snake-yaml = "org.yaml:snakeyaml:1.24"

spockframework-core = "org.spockframework:spock-core:2.0-groovy-3.0"
spockframework-core = "org.spockframework:spock-core:2.3-groovy-4.0"

spring-boot-starter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "spring-boot" }
spring-security-core = { module = "org.springframework.security:spring-security-core", version.ref = "spring-security" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 7f5f9c1

Please sign in to comment.