Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🔧 ⬆️ 🚸 Upgrade android to API 33 #1019

Merged
merged 6 commits into from
Aug 22, 2023
Merged

🔧 ⬆️ 🚸 Upgrade android to API 33 #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
86288e6
🔨 Add additional build script options
shankari Aug 19, 2023
b17f094
🔨 Change the android build scripts to use `npm run`
shankari Aug 19, 2023
8471472
🔨 Add a script to create an app zip of the current release
shankari Aug 19, 2023
faa1cfa
⬆️ Bump up the core versions
shankari Aug 19, 2023
7688caf
⬆️ 🔥 Bump up the platform version + remove override workaround
shankari Aug 20, 2023
a5f8fab
Merge pull request #1016 from shankari/upgrade_android_api_33
shankari Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions bin/gen_release_app_zip.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash

PROJECT=$1
VERSION=$2

pushd platforms/ios/build/emulator
zip -o ../../../../$PROJECT-build-$VERSION.app.zip -r NREL\ OpenPATH.app
popd
2 changes: 1 addition & 1 deletion bin/sign_and_align_keys.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fi

# Sign and release the L+ version
# Make sure the highest supported version has the biggest version code
npx cordova build android --release -- --minSdkVersion=22
npm run build-prod-android
# cp platforms/android/app/build/outputs/apk/release/app-release-unsigned.aab platforms/android/app/build/outputs/apk/app-release-signed-unaligned.apk
jarsigner -verbose -sigalg SHA256withRSA -digestalg SHA-256 -keystore ../config_files/production.keystore ./platforms/android/app/build/outputs/bundle/release/app-release.aab androidproductionkey
cp platforms/android/app/build/outputs/bundle/release/app-release.aab $1-build-$2.aab
Expand Down
3 changes: 0 additions & 3 deletions config.cordovabuild.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<preference name="webviewbounce" value="false" />
<preference name="UIWebViewBounce" value="false" />
<preference name="DisallowOverscroll" value="true" />
<preference name="android-minSdkVersion" value="22" />
<preference name="BackupWebStorage" value="none" />
<preference name="emSensorDataCollectionProtocolApprovalDate" value="2016-07-14" />
<preference name="GradlePluginGoogleServicesEnabled" value="true" />
Expand Down Expand Up @@ -48,8 +47,6 @@
</platform>
<platform name="android">
<hook src="hooks/before_build/android/android_copy_locales.js" type="before_build" />
<preference name="android-minSdkVersion" value="23" />
<preference name="android-targetSdkVersion" value="32" />
<preference name="AndroidLaunchMode" value="singleInstance"/>
<preference name="AndroidXEnabled" value="true" />
<preference name="GradlePluginKotlinEnabled" value="true" />
Expand Down
11 changes: 7 additions & 4 deletions package.cordovabuild.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
"build": "npx webpack --config webpack.prod.js && npx cordova build",
"build-dev": "npx webpack --config webpack.dev.js && npx cordova build",
"build-dev-android": "npx webpack --config webpack.dev.js && npx cordova build android",
"build-dev-ios": "npx webpack --config webpack.dev.js && npx cordova build ios"
"build-dev-ios": "npx webpack --config webpack.dev.js && npx cordova build ios",
"build-prod-android": "npx webpack --config webpack.prod.js && npx cordova build android",
"build-prod-ios": "npx webpack --config webpack.prod.js && npx cordova build ios",
"build-prod-android-release": "npx webpack --config webpack.prod.js && npx cordova build android --release"
},
"devDependencies": {
"@babel/core": "^7.21.3",
Expand Down Expand Up @@ -115,22 +118,22 @@
"chart.js": "^4.3.0",
"chartjs-adapter-luxon": "^1.3.1",
"chartjs-plugin-annotation": "^3.0.1",
"cordova-android": "11.0.0",
"cordova-android": "12.0.0",
"cordova-ios": "6.2.0",
"cordova-plugin-advanced-http": "3.3.1",
"cordova-plugin-androidx-adapter": "1.1.3",
"cordova-plugin-app-version": "0.1.14",
"cordova-plugin-customurlscheme": "5.0.2",
"cordova-plugin-device": "2.1.0",
"cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.7.8",
"cordova-plugin-em-datacollection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.7.9",
"cordova-plugin-em-opcodeauth": "git+https://github.com/e-mission/cordova-jwt-auth.git#v1.7.2",
"cordova-plugin-em-server-communication": "git+https://github.com/e-mission/cordova-server-communication.git#v1.2.6",
"cordova-plugin-em-serversync": "git+https://github.com/e-mission/cordova-server-sync.git#v1.3.2",
"cordova-plugin-em-settings": "git+https://github.com/e-mission/cordova-connection-settings.git#v1.2.3",
"cordova-plugin-em-unifiedlogger": "git+https://github.com/e-mission/cordova-unified-logger.git#v1.3.6",
"cordova-plugin-em-usercache": "git+https://github.com/e-mission/cordova-usercache.git#v1.1.6",
"cordova-plugin-email-composer": "git+https://github.com/katzer/cordova-plugin-email-composer.git#0.10.1",
"cordova-plugin-file": "7.0.0",
"cordova-plugin-file": "8.0.0",
"cordova-plugin-inappbrowser": "5.0.0",
"cordova-plugin-ionic-keyboard": "2.2.0",
"cordova-plugin-ionic-webview": "5.0.0",
Expand Down
Loading