From 798c219ef5fef418329f41293e7eceafdc6af673 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 24 Jul 2023 17:35:00 +0200
Subject: [PATCH] chore: update kalium with java 17 and jenv to 17.0 (#1999)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jakub Żerko <iot.zerko@gmail.com>
Co-authored-by: Vitor Hugo Schwaab <vitor@schwaab.xyz>
---
 .java-version                                            | 2 +-
 build-logic/plugins/build.gradle.kts                     | 9 ++++-----
 .../wire/android/gradle/KotlinAndroidConfiguration.kt    | 8 ++++----
 kalium                                                   | 2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.java-version b/.java-version
index b4de3947675..03b6389f32a 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-11
+17.0
diff --git a/build-logic/plugins/build.gradle.kts b/build-logic/plugins/build.gradle.kts
index 31afd5d3794..91375158248 100644
--- a/build-logic/plugins/build.gradle.kts
+++ b/build-logic/plugins/build.gradle.kts
@@ -21,15 +21,14 @@ plugins {
     `kotlin-dsl`
 }
 
-// Configure the build-logic plugins to target JDK 11
-// TODO: Upgrade Jenkins image to support JDK 17 and bump it here too
+// Configure the build-logic plugins to target JDK 17
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 }
 
diff --git a/build-logic/plugins/src/main/kotlin/com/wire/android/gradle/KotlinAndroidConfiguration.kt b/build-logic/plugins/src/main/kotlin/com/wire/android/gradle/KotlinAndroidConfiguration.kt
index da4c762adc5..d5e030798d4 100644
--- a/build-logic/plugins/src/main/kotlin/com/wire/android/gradle/KotlinAndroidConfiguration.kt
+++ b/build-logic/plugins/src/main/kotlin/com/wire/android/gradle/KotlinAndroidConfiguration.kt
@@ -39,8 +39,8 @@ internal fun Project.configureKotlinAndroid(
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
         isCoreLibraryDesugaringEnabled = true
     }
 
@@ -69,8 +69,8 @@ internal fun Project.configureKotlinAndroid(
 private fun Project.configureKotlin() {
     tasks.withType<KotlinCompile>().configureEach {
         kotlinOptions {
-            // Set JVM target to 11
-            jvmTarget = JavaVersion.VERSION_11.toString()
+            // Set JVM target to 17
+            jvmTarget = JavaVersion.VERSION_17.toString()
             // Treat all Kotlin warnings as errors (disabled by default)
             // Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties
             val warningsAsErrors: String? by project
diff --git a/kalium b/kalium
index 143a07a6c27..d42a5fd2275 160000
--- a/kalium
+++ b/kalium
@@ -1 +1 @@
-Subproject commit 143a07a6c275d678a4e075297499b36703b42ac6
+Subproject commit d42a5fd2275d8f23be3b7d0bff9335ff4c87edfc