Merge pull request #295 from nrkno/android-java17

Use java 17 and set permissions on gradlew required for the pipeline to run
nrkno · Jun 28, 2024 · ad62e66 · ad62e66
2 parents 8906022 + 3ab526e
commit ad62e66
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/generate-android-vectors.yml b/.github/workflows/generate-android-vectors.yml
@@ -28,8 +28,6 @@ jobs:
           commit_message: "Convert updated SVG files to Android vector files"
           file_pattern: "android/"
           skip_dirty_check: false
-      - name: chmod gradle
-        run: chmod +x android/gradlew
       - name: Publish Android
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -22,11 +22,11 @@ android {
         compose true
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 }
 

diff --git a/android/gradlew b/android/gradlew
diff --git a/android/icons/build.gradle b/android/icons/build.gradle
@@ -40,11 +40,11 @@ android {
         compose true
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 }