Skip to content

Commit 56e196f

Browse files
committed
Merge branch 'fix/android-build' into 'develop'
Fix/android-build See merge request papers/airgap/airgap-vault!542
2 parents 2012e4e + 15cceba commit 56e196f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# The setting is particularly useful for tweaking memory settings.
1212
android.enableJetifier=true
1313
android.useAndroidX=true
14-
org.gradle.jvmargs=-Xmx1536m
14+
org.gradle.jvmargs=-Xmx2048m
1515

1616
# When configured, Gradle will run in incubating parallel mode.
1717
# This option should only be used with decoupled projects. More details, visit

build/android/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ RUN apt-get update -y && apt-get install -y \
66
pkg-config \
77
libjpeg-dev \
88
libcairo2-dev \
9-
openjdk-17-jdk-headless
9+
openjdk-21-jdk-headless
1010

11-
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
11+
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
1212

1313
# create app directory
1414
RUN mkdir /app
@@ -57,4 +57,4 @@ RUN yarn prepare-prod-build \
5757
&& zipalign -p -f -v 4 android-debug.apk android-debug-aligned.apk \
5858
&& apksigner sign --ks ./build/android/debug.keystore --ks-key-alias androiddebugkey --ks-pass pass:android --key-pass pass:android android-debug-aligned.apk \
5959
&& zipalign -p -f -v 4 android-appium.apk android-appium-aligned.apk \
60-
&& apksigner sign --ks ./build/android/debug.keystore --ks-key-alias androiddebugkey --ks-pass pass:android --key-pass pass:android android-appium-aligned.apk \
60+
&& apksigner sign --ks ./build/android/debug.keystore --ks-key-alias androiddebugkey --ks-pass pass:android --key-pass pass:android android-appium-aligned.apk \

0 commit comments

Comments
 (0)