Skip to content

Commit

Permalink
Merge branch 'hotfix/android-9-white-screen' into 'master'
Browse files Browse the repository at this point in the history
Hotfix/android 9 white screen

See merge request papers/airgap/airgap-vault!394
  • Loading branch information
godenzim committed Jan 26, 2023
2 parents e41c016 + 0f7f3b0 commit 30d0534
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Chrome >=60
Firefox >=63
Edge >=79
Safari >=13
iOS >=13
6 changes: 3 additions & 3 deletions build/android/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
RUN mkdir /app
WORKDIR /app

RUN yarn global add ionic@5.4.0 @capacitor/core@3.2.5 @capacitor/cli@3.2.5 && 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/
Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit 30d0534

Please sign in to comment.