From f9946b6a843e6592b0bca1cdc19c61d17aeedbc5 Mon Sep 17 00:00:00 2001
From: doTTTTT <raphael.teyssandier@gmail.com>
Date: Sat, 7 Mar 2026 23:59:55 +0100
Subject: [PATCH] fix: JVM

---
 FloconAndroid/datastores-no-op/build.gradle.kts          | 8 ++++++++
 FloconAndroid/datastores/build.gradle.kts                | 8 ++++++++
 FloconAndroid/flocon/build.gradle.kts                    | 3 ++-
 .../grpc/grpc-interceptor-base/build.gradle.kts          | 8 ++++++++
 .../grpc/grpc-interceptor-lite/build.gradle.kts          | 9 ++++++++-
 FloconAndroid/grpc/grpc-interceptor/build.gradle.kts     | 8 ++++++++
 FloconAndroid/ktor-interceptor-no-op/build.gradle.kts    | 2 ++
 FloconAndroid/ktor-interceptor/build.gradle.kts          | 2 ++
 FloconAndroid/okhttp-interceptor-no-op/build.gradle.kts  | 7 +++++++
 FloconAndroid/okhttp-interceptor/build.gradle.kts        | 8 ++++++++
 FloconAndroid/sample-android-only/build.gradle.kts       | 7 +++++++
 11 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/FloconAndroid/datastores-no-op/build.gradle.kts b/FloconAndroid/datastores-no-op/build.gradle.kts
index ba7c2215..65736264 100644
--- a/FloconAndroid/datastores-no-op/build.gradle.kts
+++ b/FloconAndroid/datastores-no-op/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -31,6 +33,12 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 dependencies {
 
     implementation(project(":flocon-base"))
diff --git a/FloconAndroid/datastores/build.gradle.kts b/FloconAndroid/datastores/build.gradle.kts
index 443e4f57..37689886 100644
--- a/FloconAndroid/datastores/build.gradle.kts
+++ b/FloconAndroid/datastores/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -31,6 +33,12 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 dependencies {
 
     implementation(project(":flocon-base"))
diff --git a/FloconAndroid/flocon/build.gradle.kts b/FloconAndroid/flocon/build.gradle.kts
index 6ce6b5b1..b689b76c 100644
--- a/FloconAndroid/flocon/build.gradle.kts
+++ b/FloconAndroid/flocon/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
@@ -71,7 +73,6 @@ kotlin {
     }
 }
 
-
 buildConfig {
     packageName("io.github.openflocon.flocondesktop")
 
diff --git a/FloconAndroid/grpc/grpc-interceptor-base/build.gradle.kts b/FloconAndroid/grpc/grpc-interceptor-base/build.gradle.kts
index 81df01b2..9915e76c 100644
--- a/FloconAndroid/grpc/grpc-interceptor-base/build.gradle.kts
+++ b/FloconAndroid/grpc/grpc-interceptor-base/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -31,6 +33,12 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 dependencies {
     implementation(project(":flocon-base"))
 
diff --git a/FloconAndroid/grpc/grpc-interceptor-lite/build.gradle.kts b/FloconAndroid/grpc/grpc-interceptor-lite/build.gradle.kts
index 2058eb76..8e4738e9 100644
--- a/FloconAndroid/grpc/grpc-interceptor-lite/build.gradle.kts
+++ b/FloconAndroid/grpc/grpc-interceptor-lite/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -31,6 +33,12 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 dependencies {
     api(project(":grpc:grpc-interceptor-base"))
 
@@ -38,7 +46,6 @@ dependencies {
     implementation(libs.gson)
 }
 
-
 mavenPublishing {
     publishToMavenCentral(automaticRelease = true)
 
diff --git a/FloconAndroid/grpc/grpc-interceptor/build.gradle.kts b/FloconAndroid/grpc/grpc-interceptor/build.gradle.kts
index 517cedee..6feb409c 100644
--- a/FloconAndroid/grpc/grpc-interceptor/build.gradle.kts
+++ b/FloconAndroid/grpc/grpc-interceptor/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -31,6 +33,12 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 dependencies {
     api(project(":grpc:grpc-interceptor-base"))
 
diff --git a/FloconAndroid/ktor-interceptor-no-op/build.gradle.kts b/FloconAndroid/ktor-interceptor-no-op/build.gradle.kts
index 5f3ea524..3e313610 100644
--- a/FloconAndroid/ktor-interceptor-no-op/build.gradle.kts
+++ b/FloconAndroid/ktor-interceptor-no-op/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
diff --git a/FloconAndroid/ktor-interceptor/build.gradle.kts b/FloconAndroid/ktor-interceptor/build.gradle.kts
index 84c1c918..3dd5b48e 100644
--- a/FloconAndroid/ktor-interceptor/build.gradle.kts
+++ b/FloconAndroid/ktor-interceptor/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
diff --git a/FloconAndroid/okhttp-interceptor-no-op/build.gradle.kts b/FloconAndroid/okhttp-interceptor-no-op/build.gradle.kts
index 03e7d4d2..84440c5f 100644
--- a/FloconAndroid/okhttp-interceptor-no-op/build.gradle.kts
+++ b/FloconAndroid/okhttp-interceptor-no-op/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -36,6 +38,11 @@ dependencies {
     implementation(libs.okhttp3.okhttp)
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
 
 mavenPublishing {
     publishToMavenCentral(automaticRelease = true)
diff --git a/FloconAndroid/okhttp-interceptor/build.gradle.kts b/FloconAndroid/okhttp-interceptor/build.gradle.kts
index b4643a06..649558b7 100644
--- a/FloconAndroid/okhttp-interceptor/build.gradle.kts
+++ b/FloconAndroid/okhttp-interceptor/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -31,6 +33,12 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 dependencies {
 
     implementation(project(":flocon-base"))
diff --git a/FloconAndroid/sample-android-only/build.gradle.kts b/FloconAndroid/sample-android-only/build.gradle.kts
index 7c903e60..55ed7af1 100644
--- a/FloconAndroid/sample-android-only/build.gradle.kts
+++ b/FloconAndroid/sample-android-only/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.google.protobuf.gradle.id
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.application)
@@ -63,6 +64,12 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}
+
 val useMaven = false
 dependencies {
     if(useMaven) {