Use java 17

hannesa2 · May 14, 2024 · d502d7d · d502d7d
1 parent 73674d0
commit d502d7d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle
@@ -45,6 +45,7 @@ dependencies {
     implementation libs.androidx.work.runtime.ktx
     implementation(libs.androidx.browser) { because "CustomTabs required for OAuth2 and OIDC" }
     implementation(libs.androidx.enterprise.feedback) { because "MDM feedback" }
+    //noinspection UseTomlInstead
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
 
     // Image loading
@@ -73,6 +74,7 @@ dependencies {
     // Timber
     implementation libs.timber
 
+    //noinspection UseTomlInstead
     implementation 'com.github.hannesa2:edgeDetect:1.0'
 
     // Tests
@@ -123,12 +125,11 @@ 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 = '17'
     }
 
     sourceSets {

diff --git a/owncloudComLibrary/build.gradle b/owncloudComLibrary/build.gradle
@@ -46,5 +46,14 @@ android {
             includeAndroidResources = true
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = '17'
+    }
+
     namespace 'com.owncloud.android.lib'
 }
diff --git a/owncloudData/build.gradle b/owncloudData/build.gradle
@@ -26,13 +26,12 @@ android {
         }
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = '17'
     }
 
     sourceSets {

diff --git a/owncloudDomain/build.gradle b/owncloudDomain/build.gradle
@@ -17,13 +17,12 @@ android {
         }
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = '17'
     }
 
     sourceSets {

diff --git a/owncloudTestUtil/build.gradle b/owncloudTestUtil/build.gradle
@@ -18,8 +18,8 @@ android {
     namespace "com.owncloud.android.testutil"
 
     compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }