Skip to content

Commit

Permalink
Merge branch 'chore/release_prep' into 'develop'
Browse files Browse the repository at this point in the history
chore: release prep

See merge request papers/airgap/airgap-vault!498
  • Loading branch information
Isacco Sordo committed May 29, 2024
2 parents ca4b222 + 8708194 commit ddd1264
Show file tree
Hide file tree
Showing 5 changed files with 550 additions and 1,051 deletions.
1 change: 1 addition & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ build_ios:
script:
- export DEVELOPER_DIR=$XCODE_PATH
- nvm use 20
- npm install -g yarn
- yarn install --frozen-lockfile
- yarn prepare-prod-build
- yarn apply-diagnostic-modules # manually remove unused cordova-diagnostic-plugin modules
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build/android/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM beevelop/ionic:v2021.06.1
FROM beevelop/ionic:v2023.10.1

RUN apt-get update -y && apt-get install -y \
bzip2 \
Expand All @@ -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 16.19.1
RUN yarn cache clean --force && yarn global add n && n 20.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 patch-dependency-versions.js fix-qrscanner-gradle.js capacitor.config.ts ionic.config.json copy-builtin-modules.js /app/
Expand Down
80 changes: 40 additions & 40 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,50 +36,50 @@
"apply-diagnostic-modules": "node apply-diagnostic-modules.js"
},
"resolutions": {
"@airgap/acurast": "0.13.26-beta.0",
"@airgap/aeternity": "0.13.26-beta.0",
"@airgap/astar": "0.13.26-beta.0",
"@airgap/bitcoin": "0.13.26-beta.0",
"@airgap/coinlib-core": "0.13.26-beta.0",
"@airgap/coreum": "0.13.26-beta.0",
"@airgap/cosmos": "0.13.26-beta.0",
"@airgap/cosmos-core": "0.13.26-beta.0",
"@airgap/crypto": "0.13.26-beta.0",
"@airgap/ethereum": "0.13.26-beta.0",
"@airgap/groestlcoin": "0.13.26-beta.0",
"@airgap/icp": "0.13.26-beta.0",
"@airgap/module-kit": "0.13.26-beta.0",
"@airgap/moonbeam": "0.13.26-beta.0",
"@airgap/optimism": "0.13.26-beta.0",
"@airgap/polkadot": "0.13.26-beta.0",
"@airgap/serializer": "0.13.26-beta.0",
"@airgap/substrate": "0.13.26-beta.0",
"@airgap/tezos": "0.13.26-beta.0"
"@airgap/acurast": "0.13.26",
"@airgap/aeternity": "0.13.26",
"@airgap/astar": "0.13.26",
"@airgap/bitcoin": "0.13.26",
"@airgap/coinlib-core": "0.13.26",
"@airgap/coreum": "0.13.26",
"@airgap/cosmos": "0.13.26",
"@airgap/cosmos-core": "0.13.26",
"@airgap/crypto": "0.13.26",
"@airgap/ethereum": "0.13.26",
"@airgap/groestlcoin": "0.13.26",
"@airgap/icp": "0.13.26",
"@airgap/module-kit": "0.13.26",
"@airgap/moonbeam": "0.13.26",
"@airgap/optimism": "0.13.26",
"@airgap/polkadot": "0.13.26",
"@airgap/serializer": "0.13.26",
"@airgap/substrate": "0.13.26",
"@airgap/tezos": "0.13.26"
},
"dependencies": {
"@airgap-community/iso-rootstock": "1.0.0",
"@airgap/acurast": "0.13.26-beta.0",
"@airgap/aeternity": "0.13.26-beta.0",
"@airgap/angular-core": "0.0.43",
"@airgap/angular-ngrx": "0.0.43",
"@airgap/astar": "0.13.26-beta.0",
"@airgap/bitcoin": "0.13.26-beta.0",
"@airgap/coinlib-core": "0.13.26-beta.0",
"@airgap/coreum": "0.13.26-beta.0",
"@airgap/cosmos": "0.13.26-beta.0",
"@airgap/cosmos-core": "0.13.26-beta.0",
"@airgap/crypto": "0.13.26-beta.0",
"@airgap/ethereum": "0.13.26-beta.0",
"@airgap/groestlcoin": "0.13.26-beta.0",
"@airgap/icp": "0.13.26-beta.0",
"@airgap/module-kit": "0.13.26-beta.0",
"@airgap/moonbeam": "0.13.26-beta.0",
"@airgap/optimism": "0.13.26-beta.0",
"@airgap/polkadot": "0.13.26-beta.0",
"@airgap/acurast": "0.13.26",
"@airgap/aeternity": "0.13.26",
"@airgap/angular-core": "0.0.45",
"@airgap/angular-ngrx": "0.0.45",
"@airgap/astar": "0.13.26",
"@airgap/bitcoin": "0.13.26",
"@airgap/coinlib-core": "0.13.26",
"@airgap/coreum": "0.13.26",
"@airgap/cosmos": "0.13.26",
"@airgap/cosmos-core": "0.13.26",
"@airgap/crypto": "0.13.26",
"@airgap/ethereum": "0.13.26",
"@airgap/groestlcoin": "0.13.26",
"@airgap/icp": "0.13.26",
"@airgap/module-kit": "0.13.26",
"@airgap/moonbeam": "0.13.26",
"@airgap/optimism": "0.13.26",
"@airgap/polkadot": "0.13.26",
"@airgap/sapling-wasm": "0.0.7",
"@airgap/serializer": "0.13.26-beta.0",
"@airgap/substrate": "0.13.26-beta.0",
"@airgap/tezos": "0.13.26-beta.0",
"@airgap/serializer": "0.13.26",
"@airgap/substrate": "0.13.26",
"@airgap/tezos": "0.13.26",
"@angular/cdk": "^14.2.7",
"@angular/common": "17.3.7",
"@angular/core": "17.3.7",
Expand Down
Loading

0 comments on commit ddd1264

Please sign in to comment.