-
Notifications
You must be signed in to change notification settings - Fork 113
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'hotfix/android-9-white-screen' into 'master'
Hotfix/android 9 white screen See merge request papers/airgap/airgap-vault!394
- Loading branch information
Showing
2 changed files
with
8 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
Chrome >=60 | ||
Firefox >=63 | ||
Edge >=79 | ||
Safari >=13 | ||
iOS >=13 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 | |
RUN mkdir /app | ||
WORKDIR /app | ||
|
||
RUN yarn global add [email protected] @capacitor/[email protected] @capacitor/[email protected] && yarn cache clean --force && yarn global add n && n 16.13.1 | ||
RUN yarn cache clean --force && yarn global add n && n 16.13.1 | ||
|
||
# Install app dependencies, using wildcard if package-lock exists and copy capacitor configs and ionic configs | ||
COPY package.json yarn.lock apply-diagnostic-modules.js fix-qrscanner-gradle.js capacitor.config.ts ionic.config.json /app/ | ||
|
@@ -46,8 +46,8 @@ RUN sed -i -e "s/versionCode 1/versionCode $BUILD_NR/g" /app/android/app/build.g | |
RUN yarn configure-mangle \ | ||
&& yarn apply-diagnostic-modules \ | ||
&& yarn jetifier \ | ||
&& ionic build --prod \ | ||
&& cap sync android \ | ||
&& yarn ionic build --prod \ | ||
&& yarn cap sync android \ | ||
&& echo y | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --update \ | ||
&& /app/android/gradlew --project-dir /app/android clean \ | ||
&& /app/android/gradlew --project-dir /app/android build \ | ||
|