Theaninova/openstapps
1
0
Fork 0
mirror of https://gitlab.com/openstapps/openstapps.git synced 2026-02-21 08:22:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: update capacitor to v6

Browse Source
This commit is contained in:
Thea Schöbl
2024-05-30 14:04:33 +02:00
committed by Rainer Killinger
parent af4c885e3e
commit 05aaa227a9
4 changed files with 590 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
flake.nix
View File

@@ -11,7 +11,7 @@
flake-utils, flake-utils,
}: }:
let let
aapt2buildToolsVersion = "33.0.2"; aapt2buildToolsVersion = "34.0.0";
in in
flake-utils.lib.eachDefaultSystem ( flake-utils.lib.eachDefaultSystem (
system: system:
@@ -30,7 +30,7 @@
++ (with fonttools.optional-dependencies; [ woff ]) ++ (with fonttools.optional-dependencies; [ woff ])
); );
android = prev.androidenv.composeAndroidPackages { android = prev.androidenv.composeAndroidPackages {
buildToolsVersions = [ buildToolsVersions = prev.lib.lists.unique [
"34.0.0" "34.0.0"
aapt2buildToolsVersion aapt2buildToolsVersion
]; ];
@@ -44,7 +44,6 @@
}; };
}); });
nodejs = prev.nodejs_18; nodejs = prev.nodejs_18;
corepack = prev.corepack_18;
}) })
]; ];
config = { config = {

6
frontend/app/package.json
View File

@@ -87,9 +87,9 @@
"@openstapps/api": "workspace:*", "@openstapps/api": "workspace:*",
"@openstapps/collection-utils": "workspace:*", "@openstapps/collection-utils": "workspace:*",
"@openstapps/core": "workspace:*", "@openstapps/core": "workspace:*",
"@transistorsoft/capacitor-background-fetch": "5.2.0", "@transistorsoft/capacitor-background-fetch": "6.0.0",
"@types/dom-view-transitions": "1.0.4", "@types/dom-view-transitions": "1.0.4",
"capacitor-secure-storage-plugin": "0.9.0", "capacitor-secure-storage-plugin": "0.10.0",
"cordova-plugin-calendar": "5.1.6", "cordova-plugin-calendar": "5.1.6",
"date-fns": "3.6.0", "date-fns": "3.6.0",
"deepmerge": "4.3.1", "deepmerge": "4.3.1",
@@ -106,6 +106,7 @@
"ngx-moment": "6.0.2", "ngx-moment": "6.0.2",
"opening_hours": "3.8.0", "opening_hours": "3.8.0",
"pmtiles": "3.0.3", "pmtiles": "3.0.3",
"prettier": "3.1.1",
"rxjs": "7.8.1", "rxjs": "7.8.1",
"semver": "7.6.0", "semver": "7.6.0",
"swiper": "8.4.5", "swiper": "8.4.5",
@@ -191,3 +192,4 @@
] ]
} }
} }

6
images/app-builder/Dockerfile
View File

@@ -105,9 +105,9 @@ RUN bash /tmp/$NODE_SETUP_SCRIPT && apt-get install -y nodejs && \
npm install -g --unsafe-perm @ionic/cli@$IONIC_VERSION cordova-res@$CORDOVA_RES_VERSION npm install -g --unsafe-perm @ionic/cli@$IONIC_VERSION cordova-res@$CORDOVA_RES_VERSION
RUN cd / && ionic start $TMP_PROJECT_NAME blank --type=angular --capacitor --no-git --no-interactive && \ RUN cd / && ionic start $TMP_PROJECT_NAME blank --type=angular --capacitor --no-git --no-interactive && \
cd $TMP_PROJECT_NAME && ionic capacitor add android && export NG_CLI_ANALYTICS=ci && ionic capacitor build android --no-open && \ cd $TMP_PROJECT_NAME && ionic capacitor add android && export NG_CLI_ANALYTICS=ci && ionic capacitor build android --no-open && \
cd android && ./gradlew assembleDebug && \ cd android && ./gradlew assembleDebug && \
cd / && rm -rf $TMP_PROJECT_NAME cd / && rm -rf $TMP_PROJECT_NAME
### Compatibility with musl libc ### Compatibility with musl libc

1148
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff