From c82ff9d6cfe547f1431eaa5f86fd395a96be7552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB?= <zhitelevkm@m2.ru>
Date: Wed, 18 Jan 2023 14:49:57 +0400
Subject: [PATCH] Move to Java 17

---
 .github/workflows/test.yaml                   |  2 +-
 build.gradle                                  | 29 +++++++------------
 gradle/libs.versions.toml                     | 10 +++----
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../upstream/signature/EcdsaSigner.kt         |  2 +-
 5 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 341379d5..590f024b 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -24,7 +24,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 13
+          java-version: 17
 
       - name: Install System Libs
         run: sudo apt-get install -y openssl libapr1
diff --git a/build.gradle b/build.gradle
index e6026f5d..d240a991 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ group = 'io.emeraldpay.dshackle'
 version = '0.21.0-SNAPSHOT'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_13
-    targetCompatibility = JavaVersion.VERSION_13
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 repositories {
@@ -115,12 +115,12 @@ dependencies {
 
 compileKotlin {
     kotlinOptions {
-        jvmTarget = "13"
+        jvmTarget = "17"
     }
 }
 compileTestKotlin {
     kotlinOptions {
-        jvmTarget = "13"
+        jvmTarget = "17"
     }
 }
 
@@ -153,7 +153,7 @@ application {
 
 jib {
     from {
-        image = 'openjdk:13'
+        image = 'openjdk:17'
     }
     to {
         // by default publish as:
@@ -293,26 +293,19 @@ jacoco {
 }
 
 detekt {
-    toolVersion = "1.18.1"
+    toolVersion = "1.22.0"
     parallel = false
     basePath = projectDir
     debug = false
     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 {
-    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
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b3af0d0f..5d46641d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,18 +1,18 @@
 [versions]
-detekt = "1.18.1"
+detekt = "1.22.0"
 etherjar = "0.11.1"
-groovy = "2.5.14"
+groovy = "3.0.9"
 protoc = "3.21.7"
 slf4j = "1.7.32"
 jackson = "2.11.0"
 grpc = "1.49.2"
 reactive-grpc = "1.2.0"
-spring-boot = "2.5.6"
+spring-boot = "2.6.0"
 spring-security = "5.5.3"
 reactor = "3.4.10"
 netty = "4.1.84.Final"
 netty-tcnative = "2.0.48.Final"
-kotlin = "1.5.31"
+kotlin = "1.7.20"
 httpcomponents = "4.5.8"
 
 [libraries]
@@ -137,7 +137,7 @@ junit = ["junit-jupiter", "assertj"]
 [plugins]
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 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" }
 protobuf = { id = "com.google.protobuf", version = "0.9.1" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "10.2.0" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffed3a25..e750102e 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-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/signature/EcdsaSigner.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/signature/EcdsaSigner.kt
index eb5ac760..902ff4e3 100644
--- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/signature/EcdsaSigner.kt
+++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/signature/EcdsaSigner.kt
@@ -17,7 +17,7 @@ class EcdsaSigner(
     }
 
     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)
         val wrapped = wrapMessage(nonce, message, source)
         sig.update(wrapped.toByteArray())