From 9c4ad6aa5af6c285365beff094b00f0df46248f5 Mon Sep 17 00:00:00 2001
From: Juan Carlos Garrote <juanca_arrabal@hotmail.com>
Date: Mon, 4 Nov 2024 09:11:52 +0100
Subject: [PATCH] build: upgraded Java version to 17 in Java and Kotlin options
 in build.gradle files

---
 owncloudApp/build.gradle        |  6 +++---
 owncloudComLibrary/build.gradle |  9 +++++++++
 owncloudData/build.gradle       | 10 +++++-----
 owncloudDomain/build.gradle     | 10 +++++-----
 owncloudTestUtil/build.gradle   |  9 +++++++++
 5 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle
index faa0df182e1..45cf212a379 100644
--- a/owncloudApp/build.gradle
+++ b/owncloudApp/build.gradle
@@ -104,12 +104,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     sourceSets {
diff --git a/owncloudComLibrary/build.gradle b/owncloudComLibrary/build.gradle
index 782fd80e411..990895e4ff7 100644
--- a/owncloudComLibrary/build.gradle
+++ b/owncloudComLibrary/build.gradle
@@ -36,6 +36,15 @@ android {
         targetSdkVersion sdkTargetVersion
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+
     lint {
         abortOnError false
         ignoreWarnings true
diff --git a/owncloudData/build.gradle b/owncloudData/build.gradle
index 1c66b51e8ec..0e62c821d84 100644
--- a/owncloudData/build.gradle
+++ b/owncloudData/build.gradle
@@ -26,13 +26,13 @@ android {
         }
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     sourceSets {
diff --git a/owncloudDomain/build.gradle b/owncloudDomain/build.gradle
index 4d6b3547408..93d50153250 100644
--- a/owncloudDomain/build.gradle
+++ b/owncloudDomain/build.gradle
@@ -17,13 +17,13 @@ android {
         }
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     sourceSets {
diff --git a/owncloudTestUtil/build.gradle b/owncloudTestUtil/build.gradle
index 3d67e667cec..9e03fd7fc45 100644
--- a/owncloudTestUtil/build.gradle
+++ b/owncloudTestUtil/build.gradle
@@ -9,6 +9,15 @@ android {
         targetSdkVersion sdkTargetVersion
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+
     buildTypes {
         release {
             minifyEnabled false