Move to Java 17

This commit is contained in:
Кирилл
2023-01-18 14:49:57 +04:00
parent 66c732563b
commit c82ff9d6cf
5 changed files with 19 additions and 26 deletions

View File

@@ -24,7 +24,7 @@ jobs:
- name: Set up JDK - name: Set up JDK
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: 13 java-version: 17
- name: Install System Libs - name: Install System Libs
run: sudo apt-get install -y openssl libapr1 run: sudo apt-get install -y openssl libapr1

View File

@@ -39,8 +39,8 @@ group = 'io.emeraldpay.dshackle'
version = '0.21.0-SNAPSHOT' version = '0.21.0-SNAPSHOT'
java { java {
sourceCompatibility = JavaVersion.VERSION_13 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_13 targetCompatibility = JavaVersion.VERSION_17
} }
repositories { repositories {
@@ -115,12 +115,12 @@ dependencies {
compileKotlin { compileKotlin {
kotlinOptions { kotlinOptions {
jvmTarget = "13" jvmTarget = "17"
} }
} }
compileTestKotlin { compileTestKotlin {
kotlinOptions { kotlinOptions {
jvmTarget = "13" jvmTarget = "17"
} }
} }
@@ -153,7 +153,7 @@ application {
jib { jib {
from { from {
image = 'openjdk:13' image = 'openjdk:17'
} }
to { to {
// by default publish as: // by default publish as:
@@ -293,26 +293,19 @@ jacoco {
} }
detekt { detekt {
toolVersion = "1.18.1" toolVersion = "1.22.0"
parallel = false parallel = false
basePath = projectDir basePath = projectDir
debug = false debug = false
ignoreFailures = true ignoreFailures = true
reports {
xml {
enabled = true
destination = file("build/reports/detekt/detekt.xml")
}
html {
enabled = true
destination = file("build/reports/detekt/detekt.html")
}
}
} }
tasks.withType(Detekt).configureEach { tasks.withType(Detekt).configureEach {
jvmTarget = "13" reports {
xml.outputLocation.set(file("build/reports/detekt/detekt.xml"))
html.outputLocation.set(file("build/reports/detekt/detekt.html"))
}
jvmTarget = "17"
} }
// formats code for each build // formats code for each build

View File

@@ -1,18 +1,18 @@
[versions] [versions]
detekt = "1.18.1" detekt = "1.22.0"
etherjar = "0.11.1" etherjar = "0.11.1"
groovy = "2.5.14" groovy = "3.0.9"
protoc = "3.21.7" protoc = "3.21.7"
slf4j = "1.7.32" slf4j = "1.7.32"
jackson = "2.11.0" jackson = "2.11.0"
grpc = "1.49.2" grpc = "1.49.2"
reactive-grpc = "1.2.0" reactive-grpc = "1.2.0"
spring-boot = "2.5.6" spring-boot = "2.6.0"
spring-security = "5.5.3" spring-security = "5.5.3"
reactor = "3.4.10" reactor = "3.4.10"
netty = "4.1.84.Final" netty = "4.1.84.Final"
netty-tcnative = "2.0.48.Final" netty-tcnative = "2.0.48.Final"
kotlin = "1.5.31" kotlin = "1.7.20"
httpcomponents = "4.5.8" httpcomponents = "4.5.8"
[libraries] [libraries]
@@ -137,7 +137,7 @@ junit = ["junit-jupiter", "assertj"]
[plugins] [plugins]
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
jib = { id = "com.google.cloud.tools.jib", version = "2.5.0" } jib = { id = "com.google.cloud.tools.jib", version = "2.5.0" }
spring = { id = "org.springframework.boot", version = "2.3.5.RELEASE" } spring = { id = "org.springframework.boot", version = "2.6.0" }
git = { id = "com.palantir.git-version", version = "0.12.3" } git = { id = "com.palantir.git-version", version = "0.12.3" }
protobuf = { id = "com.google.protobuf", version = "0.9.1" } protobuf = { id = "com.google.protobuf", version = "0.9.1" }
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "10.2.0" } ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "10.2.0" }

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-7.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@@ -17,7 +17,7 @@ class EcdsaSigner(
} }
override fun sign(nonce: Long, message: ByteArray, source: String): ResponseSigner.Signature { override fun sign(nonce: Long, message: ByteArray, source: String): ResponseSigner.Signature {
val sig = Signature.getInstance(SIGN_SCHEME) val sig = Signature.getInstance(SIGN_SCHEME, "BC")
sig.initSign(privateKey) sig.initSign(privateKey)
val wrapped = wrapMessage(nonce, message, source) val wrapped = wrapMessage(nonce, message, source)
sig.update(wrapped.toByteArray()) sig.update(wrapped.toByteArray())