fixing gradle properties on Linux

webosbrew · Feb 17, 2025 · 83252df · 83252df
1 parent 0586ad4
commit 83252df
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/build-verify.yml b/.github/workflows/build-verify.yml
@@ -77,7 +77,7 @@ jobs:
         if: env.CI_BUILD_FOR == 'android'
         uses: android-actions/setup-android@v3
         with:
-          packages: "build-tools;34.0.0 ndk;${{ env.ANDROID_NDK_VERSION }} platforms;android-33"
+          packages: "build-tools;34.0.0 ndk;${{ env.ANDROID_NDK_VERSION }} platforms;android-34"
 
       - name: Add NDK to PATH
         if: env.CI_BUILD_FOR == 'android'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -100,7 +100,7 @@ jobs:
         if: startsWith(matrix.target, 'android')
         uses: android-actions/setup-android@v3
         with:
-          packages: "build-tools;${{ env.ANDROID_BUILD_TOOLS_VERSION}} ndk;${{ env.ANDROID_NDK_VERSION }} platforms;android-33"
+          packages: "build-tools;${{ env.ANDROID_BUILD_TOOLS_VERSION}} ndk;${{ env.ANDROID_NDK_VERSION }} platforms;android-34"
 
       - name: Add Android SDK Paths
         if: startsWith(matrix.target, 'android')

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -23,11 +23,12 @@ def use_prebuilt_openssl
 end
 
 def set_signing_properties
-  puts "Setting signing properties"
-  ENV["ORG_GRADLE_PROJECT_android.injected.signing.store.file"] = ENV["ANDROID_SIGNING_STORE_FILE"]
-  ENV["ORG_GRADLE_PROJECT_android.injected.signing.store.password"] = ENV["ANDROID_SIGNING_STORE_PASSWORD"]
-  ENV["ORG_GRADLE_PROJECT_android.injected.signing.key.alias"] = ENV["ANDROID_SIGNING_KEY_ALIAS"]
-  ENV["ORG_GRADLE_PROJECT_android.injected.signing.key.password"] = ENV["ANDROID_SIGNING_KEY_PASSWORD"]
+  ENV["GRADLE_OPTS"] = {
+    "android.injected.signing.store.file" => ENV["ANDROID_SIGNING_STORE_FILE"],
+    "android.injected.signing.store.password" => ENV["ANDROID_SIGNING_STORE_PASSWORD"],
+    "android.injected.signing.key.alias" => ENV["ANDROID_SIGNING_KEY_ALIAS"],
+    "android.injected.signing.key.password" => ENV["ANDROID_SIGNING_KEY_PASSWORD"],
+  }.map { |k, v| "-Dorg.gradle.project.#{k}=#{v}" }.join(" ")
 end
 
 platform :android do