Merge branch 'fix/reset_3.31.0' into 'develop'

Fix/reset 3.31.0

See merge request papers/airgap/airgap-vault!505

.gitlab-ci.yml

@@ -89,8 +89,8 @@ build_ios:
     - echo "$IOS_BUILD_JSON" > build.json
   script:
     - export DEVELOPER_DIR=$XCODE_PATH
-    - nvm use 20
-    - npm install -g yarn
+    - nvm use 18
+    - npm i -g yarn
     - yarn install --frozen-lockfile
     - yarn prepare-prod-build
     - yarn apply-diagnostic-modules # manually remove unused cordova-diagnostic-plugin modules

Dockerfile

@@ -7,8 +7,8 @@ RUN apt-get install -yq git
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
 RUN echo "deb http://us-west-2.ec2.archive.ubuntu.com/ubuntu/ trusty multiverse \
-  deb http://us-west-2.ec2.archive.ubuntu.com/ubuntu/ trusty-updates multiverse \
-  deb http://us-west-2.ec2.archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse" | tee /etc/apt/sources.list.d/multiverse.list
+deb http://us-west-2.ec2.archive.ubuntu.com/ubuntu/ trusty-updates multiverse \
+deb http://us-west-2.ec2.archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse" | tee /etc/apt/sources.list.d/multiverse.list
 
 # Install latest chrome dev package and fonts to support major charsets (Chinese, Japanese, Arabic, Hebrew, Thai and a few others)
 # Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y wget --no-install-recommends \
   && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
   && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
   && apt-get update \
-  && apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst  libglu1 ttf-freefont libxss1 libglib2.0-0 libxshmfence1 libglu1 \
+  && apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst  libglu1 ttf-freefont libxss1 libglib2.0-0 libxshmfence1 \
   --no-install-recommends \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get purge --auto-remove -y curl \

README.md

@@ -176,4 +176,4 @@ Before integrating a new feature, please quickly reach out to us in an issue so
 - [airgap-coin-lib](https://github.com/airgap-it/airgap-coin-lib)
 
 - [AirGap Linux Distribution](https://github.com/airgap-it/airgap-distro)
-- [apk-signer](https://github.com/airgap-it/airgap-raspberry-apk-signer)
+- [apk-signer](https://github.com/airgap-it/airgap-raspberry-apk-signer)

angular.json

@@ -96,11 +96,11 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "buildTarget": "app:build"
+            "browserTarget": "app:build"
           },
           "configurations": {
             "production": {
-              "buildTarget": "app:build:production"
+              "browserTarget": "app:build:production"
             },
             "ci": {
             }
@@ -109,7 +109,7 @@
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "buildTarget": "app:build"
+            "browserTarget": "app:build"
           }
         },
         "test": {

build/android/Dockerfile

@@ -1,4 +1,4 @@
-FROM beevelop/ionic:v2023.10.1
+FROM beevelop/ionic:v2021.06.1
 
 RUN apt-get update -y && apt-get install -y \
     bzip2 \
@@ -14,7 +14,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
 RUN mkdir /app
 WORKDIR /app
 
-RUN yarn cache clean --force && yarn global add n && n 20.13.1
+RUN yarn cache clean --force && yarn global add n && n 20
 
 # 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 patch-dependency-versions.js fix-qrscanner-gradle.js capacitor.config.ts ionic.config.json copy-builtin-modules.js /app/

ios/App/Podfile.lock

@@ -1,22 +1,22 @@
 PODS:
-  - Capacitor (5.2.2):
+  - Capacitor (5.7.7):
     - CapacitorCordova
-  - CapacitorApp (5.0.6):
+  - CapacitorApp (5.0.8):
     - Capacitor
-  - CapacitorAppLauncher (5.0.6):
+  - CapacitorAppLauncher (5.0.8):
     - Capacitor
-  - CapacitorClipboard (5.0.6):
+  - CapacitorClipboard (5.0.8):
     - Capacitor
-  - CapacitorCordova (5.2.2)
-  - CapacitorFilesystem (5.1.2):
+  - CapacitorCordova (5.7.7)
+  - CapacitorFilesystem (5.2.2):
     - Capacitor
-  - CapacitorSplashScreen (5.0.6):
+  - CapacitorSplashScreen (5.0.8):
     - Capacitor
-  - CapacitorStatusBar (5.0.6):
+  - CapacitorStatusBar (5.0.8):
     - Capacitor
   - CapawesomeCapacitorFilePicker (0.5.10):
     - Capacitor
-  - CordovaPlugins (5.2.2):
+  - CordovaPlugins (5.7.7):
     - CapacitorCordova
   - ZIPFoundation (0.9.16)
 
@@ -60,18 +60,18 @@ EXTERNAL SOURCES:
     :path: "../capacitor-cordova-ios-plugins"
 
 SPEC CHECKSUMS:
-  Capacitor: 070b18988e0f566728ae9a5eb3a7a974595f1626
-  CapacitorApp: 024e1b1bea5f883d79f6330d309bc441c88ad04a
-  CapacitorAppLauncher: 5a9f06c13c6b4f5d65b550a07128ef04f3a216b3
-  CapacitorClipboard: 77edf49827ea21da2a9c05c690a4a6a4d07199c4
-  CapacitorCordova: 3773395d5331add072300ff6041ca2cf7b93cb0b
-  CapacitorFilesystem: 5efb77d5dc1c8c05bce5e19f0e7bfdf72363fb43
-  CapacitorSplashScreen: 5fa2ab5e46cf5cc530cf16a51c80c7a986579ccd
-  CapacitorStatusBar: 565c0a1ebd79bb40d797606a8992b4a105885309
+  Capacitor: 0039e9b67cfde2d5e9111b3ddca8c0097f4cf2f4
+  CapacitorApp: 102e553c3b1fdc255969c39aa19b529675690ef4
+  CapacitorAppLauncher: 1483f5241bd56d2720af833d830c1a724ca04e96
+  CapacitorClipboard: 03628c89fe70d06d36288ee4eff7e205a6e81e53
+  CapacitorCordova: d906edead798c9bb1b07274f15615878d27507d5
+  CapacitorFilesystem: 202b158a878462ab4f401d0eb4d9644c67927333
+  CapacitorSplashScreen: 7a69e693bc1ef83e4bd3fb073bd8c8fa33e9059e
+  CapacitorStatusBar: 51af549cfcf35aac3ab072b062967ae5971ee485
   CapawesomeCapacitorFilePicker: 3c6c193300649c9c7ce49426e17582edbf7ed601
-  CordovaPlugins: c037ff3bbbdb27be88127c56e56f5c5f2702adc7
+  CordovaPlugins: 91d13f392c0503ab8079672f2d5af33e4a269dce
   ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced
 
 PODFILE CHECKSUM: 51db8af4d6f01d50e8e2a9025e652f730fdb53af
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.15.2