Oppdatere grpc versjoner og java versjon i jitpack - har ikke blitt bygget siden sist bibliotekbump.

- Vi må vurdere grpc bruken i fremtiden.

Author: geiralund

build.gradle.kts

@@ -39,7 +39,7 @@ allprojects {
     }
 
     tasks.withType<Wrapper> {
-        gradleVersion = "6.5.1"
+        gradleVersion = "7.5.1"
     }
 
     spotless {

dp-inntekt-api/build.gradle.kts

@@ -42,7 +42,6 @@ dependencies {
     implementation(Ktor2.Server.library("metrics-micrometer"))
     implementation(Ktor2.Server.library("metrics-micrometer"))
 
-    // implementation(Dagpenger.Biblioteker.ktorUtils)
     implementation(Micrometer.prometheusRegistry)
 
     implementation(Graphql.client)

dp-inntekt-api/src/test/kotlin/no/nav/dagpenger/inntekt/subsumsjonbrukt/KafkaSubsumsjonBruktDataConsumerTest.kt

@@ -33,7 +33,7 @@ private val LOGGER = KotlinLogging.logger { }
 internal class KafkaSubsumsjonBruktDataConsumerTest {
     private object Kafka {
         val instance by lazy {
-            KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka").withTag("5.3.1")).apply {
+            KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka").withTag("6.1.9")).apply {
                 this.waitingFor(HostPortWaitStrategy())
                 this.start()
             }

dp-inntekt-grpc/build.gradle.kts

@@ -1,13 +1,13 @@
 import com.google.protobuf.gradle.* // ktlint-disable no-wildcard-imports
 
-val grpcVersion = "1.43.0"
-val grpcKotlinVersion = "1.1.0"
-val protbufVersion = "3.17.3"
-val protobufGradleVersion = "0.8.16"
+val grpcVersion = "1.51.1"
+val grpcKotlinVersion = "1.3.0"
+val protbufVersion = "3.21.12"
+val protobufGradleVersion = "0.9.2"
 
 plugins {
     kotlin("jvm")
-    id("com.google.protobuf") version "0.8.16"
+    id("com.google.protobuf") version "0.9.2"
 }
 
 apply(plugin = "com.google.protobuf")
@@ -68,7 +68,7 @@ protobuf {
             artifact = "io.grpc:protoc-gen-grpc-java:$grpcVersion"
         }
         id("grpckotlin") {
-            artifact = "io.grpc:protoc-gen-grpc-kotlin:$grpcKotlinVersion:jdk7@jar"
+            artifact = "io.grpc:protoc-gen-grpc-kotlin:$grpcKotlinVersion:jdk8@jar"
         }
     }
 

gradle/wrapper/gradle-wrapper.jar

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

gradlew.bat

@@ -1,2 +1,5 @@
 jdk:
-  - openjdk13
+  - openjdk17
+before_install:
+  - sdk install java 17.0.5-open
+  - sdk use java 17.0.5-open