MOBILE-3959 android: Update Cordova Android to 10.1.1
parent
7cc309275c
commit
091cfd1a59
|
@ -22,7 +22,9 @@ jobs:
|
||||||
git clone --branch integration --depth 1 https://github.com/moodlehq/moodle-local_moodlemobileapp $GITHUB_WORKSPACE/moodle/local/moodlemobileapp
|
git clone --branch integration --depth 1 https://github.com/moodlehq/moodle-local_moodlemobileapp $GITHUB_WORKSPACE/moodle/local/moodlemobileapp
|
||||||
git clone --branch master --depth 1 https://github.com/moodlehq/moodle-docker $GITHUB_WORKSPACE/moodle-docker
|
git clone --branch master --depth 1 https://github.com/moodlehq/moodle-docker $GITHUB_WORKSPACE/moodle-docker
|
||||||
- name: Install npm packages
|
- name: Install npm packages
|
||||||
run: npm ci
|
run: |
|
||||||
|
npm install -g npm@7
|
||||||
|
npm ci --no-audit
|
||||||
- name: Generate Behat tests plugin
|
- name: Generate Behat tests plugin
|
||||||
run: |
|
run: |
|
||||||
export MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle
|
export MOODLE_DOCKER_WWWROOT=$GITHUB_WORKSPACE/moodle
|
||||||
|
|
|
@ -24,6 +24,7 @@ before_install:
|
||||||
- npm --version
|
- npm --version
|
||||||
- nvm --version
|
- nvm --version
|
||||||
- npm ci
|
- npm ci
|
||||||
|
- yes | sdkmanager "build-tools;30.0.3"
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- npx gulp
|
- npx gulp
|
||||||
|
|
|
@ -6,7 +6,8 @@ WORKDIR /app
|
||||||
# Prepare node dependencies
|
# Prepare node dependencies
|
||||||
RUN apt-get update && apt-get install libsecret-1-0 -y
|
RUN apt-get update && apt-get install libsecret-1-0 -y
|
||||||
COPY package*.json ./
|
COPY package*.json ./
|
||||||
RUN npm ci
|
RUN npm install -g npm@7
|
||||||
|
RUN npm ci --no-audit
|
||||||
|
|
||||||
# Build source
|
# Build source
|
||||||
ARG build_command="npm run build:prod"
|
ARG build_command="npm run build:prod"
|
||||||
|
|
|
@ -49,6 +49,8 @@
|
||||||
<preference name="WKWebViewOnly" value="true" />
|
<preference name="WKWebViewOnly" value="true" />
|
||||||
<preference name="WKFullScreenEnabled" value="true" />
|
<preference name="WKFullScreenEnabled" value="true" />
|
||||||
<preference name="AndroidXEnabled" value="true" />
|
<preference name="AndroidXEnabled" value="true" />
|
||||||
|
<preference name="GradlePluginGoogleServicesEnabled" value="true" />
|
||||||
|
<preference name="GradlePluginGoogleServicesVersion" value="4.3.10" />
|
||||||
<feature name="StatusBar">
|
<feature name="StatusBar">
|
||||||
<param name="ios-package" onload="true" value="CDVStatusBar" />
|
<param name="ios-package" onload="true" value="CDVStatusBar" />
|
||||||
</feature>
|
</feature>
|
||||||
|
@ -188,12 +190,6 @@
|
||||||
<param name="onload" value="true" />
|
<param name="onload" value="true" />
|
||||||
</feature>
|
</feature>
|
||||||
</config-file>
|
</config-file>
|
||||||
<config-file parent="/*" target="res/xml/config.xml">
|
|
||||||
<feature name="Whitelist">
|
|
||||||
<param name="android-package" value="org.apache.cordova.whitelist.WhitelistPlugin" />
|
|
||||||
<param name="onload" value="true" />
|
|
||||||
</feature>
|
|
||||||
</config-file>
|
|
||||||
<config-file parent="/*" target="res/xml/config.xml">
|
<config-file parent="/*" target="res/xml/config.xml">
|
||||||
<feature name="SQLitePlugin">
|
<feature name="SQLitePlugin">
|
||||||
<param name="android-package" value="io.sqlc.SQLitePlugin" />
|
<param name="android-package" value="io.sqlc.SQLitePlugin" />
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -72,11 +72,12 @@
|
||||||
"@ionic-native/web-intent": "^5.33.0",
|
"@ionic-native/web-intent": "^5.33.0",
|
||||||
"@ionic-native/zip": "^5.33.0",
|
"@ionic-native/zip": "^5.33.0",
|
||||||
"@ionic/angular": "^5.9.2",
|
"@ionic/angular": "^5.9.2",
|
||||||
"@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.2",
|
"@moodlehq/cordova-plugin-file-transfer": "1.7.1-moodle.5",
|
||||||
"@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.3",
|
"@moodlehq/cordova-plugin-inappbrowser": "5.0.0-moodle.3",
|
||||||
"@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
|
"@moodlehq/cordova-plugin-ionic-webview": "5.0.0-moodle.1",
|
||||||
"@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.3",
|
"@moodlehq/cordova-plugin-local-notification": "0.9.0-moodle.3",
|
||||||
"@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
|
"@moodlehq/cordova-plugin-qrscanner": "3.0.1-moodle.2",
|
||||||
|
"@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1",
|
||||||
"@moodlehq/phonegap-plugin-push": "2.0.0-moodle.2",
|
"@moodlehq/phonegap-plugin-push": "2.0.0-moodle.2",
|
||||||
"@ngx-translate/core": "^13.0.0",
|
"@ngx-translate/core": "^13.0.0",
|
||||||
"@ngx-translate/http-loader": "^6.0.0",
|
"@ngx-translate/http-loader": "^6.0.0",
|
||||||
|
@ -86,7 +87,7 @@
|
||||||
"chart.js": "^2.9.4",
|
"chart.js": "^2.9.4",
|
||||||
"com-darryncampbell-cordova-plugin-intent": "^1.3.0",
|
"com-darryncampbell-cordova-plugin-intent": "^1.3.0",
|
||||||
"cordova": "^10.0.0",
|
"cordova": "^10.0.0",
|
||||||
"cordova-android": "^9.1.0",
|
"cordova-android": "^10.1.1",
|
||||||
"cordova-android-support-gradle-release": "^3.0.1",
|
"cordova-android-support-gradle-release": "^3.0.1",
|
||||||
"cordova-clipboard": "^1.3.0",
|
"cordova-clipboard": "^1.3.0",
|
||||||
"cordova-ios": "^6.2.0",
|
"cordova-ios": "^6.2.0",
|
||||||
|
@ -108,10 +109,8 @@
|
||||||
"cordova-plugin-prevent-override": "^1.0.0",
|
"cordova-plugin-prevent-override": "^1.0.0",
|
||||||
"cordova-plugin-splashscreen": "^6.0.0",
|
"cordova-plugin-splashscreen": "^6.0.0",
|
||||||
"cordova-plugin-statusbar": "^2.4.3",
|
"cordova-plugin-statusbar": "^2.4.3",
|
||||||
"cordova-plugin-whitelist": "^1.3.4",
|
|
||||||
"cordova-plugin-wkuserscript": "^1.0.0",
|
"cordova-plugin-wkuserscript": "^1.0.0",
|
||||||
"cordova-plugin-wkwebview-cookies": "^1.0.0",
|
"cordova-plugin-wkwebview-cookies": "^1.0.0",
|
||||||
"@moodlehq/cordova-plugin-zip": "3.1.0-moodle.1",
|
|
||||||
"cordova-sqlite-storage": "^6.0.0",
|
"cordova-sqlite-storage": "^6.0.0",
|
||||||
"cordova-support-google-services": "^1.2.1",
|
"cordova-support-google-services": "^1.2.1",
|
||||||
"cordova.plugins.diagnostic": "^5.0.2",
|
"cordova.plugins.diagnostic": "^5.0.2",
|
||||||
|
@ -219,7 +218,6 @@
|
||||||
"@moodlehq/cordova-plugin-qrscanner": {},
|
"@moodlehq/cordova-plugin-qrscanner": {},
|
||||||
"cordova-plugin-splashscreen": {},
|
"cordova-plugin-splashscreen": {},
|
||||||
"cordova-plugin-statusbar": {},
|
"cordova-plugin-statusbar": {},
|
||||||
"cordova-plugin-whitelist": {},
|
|
||||||
"cordova-plugin-wkuserscript": {},
|
"cordova-plugin-wkuserscript": {},
|
||||||
"cordova-plugin-wkwebview-cookies": {},
|
"cordova-plugin-wkwebview-cookies": {},
|
||||||
"@moodlehq/cordova-plugin-zip": {},
|
"@moodlehq/cordova-plugin-zip": {},
|
||||||
|
|
Loading…
Reference in New Issue