From be8d414a62fa34d0db4df3172d8658ad59a6cf6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Schia?= Date: Fri, 28 Jun 2024 12:30:09 +0200 Subject: [PATCH 1/2] chmod the file directly instead of in the script --- .github/workflows/generate-android-vectors.yml | 2 -- android/gradlew | 0 2 files changed, 2 deletions(-) mode change 100644 => 100755 android/gradlew diff --git a/.github/workflows/generate-android-vectors.yml b/.github/workflows/generate-android-vectors.yml index e761ee2c..0423bfff 100644 --- 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/gradlew b/android/gradlew old mode 100644 new mode 100755 From 3ab526ef0a797ec5df92d9bbe04db9a236ea35c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Schia?= Date: Fri, 28 Jun 2024 12:32:24 +0200 Subject: [PATCH 2/2] Use Java 17 as the pipeline requires it --- android/app/build.gradle | 6 +++--- android/icons/build.gradle | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 8a3208a2..ae029cf3 100644 --- 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/icons/build.gradle b/android/icons/build.gradle index 3f811246..29c2a927 100644 --- 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' } }