Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Release 5.0.2 migration #3208

Merged
merged 5 commits into from
Oct 25, 2022
Merged

Release 5.0.2 migration #3208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40050e3
Issue #ED-354 fix:Migration fix for cordova-android10
vpPavithra Oct 17, 2022
6db0323
Issue #ED-354 fix:"Migration fix to cordova-android10"
vpPavithra Oct 18, 2022
b6949da
Issue #ED-354 fix:"Migration fix to cordova-android10 - plugin updated"
vpPavithra Oct 18, 2022
126150b
Issue #ED-354 fix:"added the removed plugin file to config.xml"
vpPavithra Oct 18, 2022
7085e57
Issue #ED-354 fix:"Migration to android SDK-31"
vpPavithra Oct 20, 2022
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
4 changes: 2 additions & 2 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ SUNBIRD_CORDOVA_COUNTER=0
# Pass build branch as input
buildBranch="$1"
rm package-lock.json && npm install
export CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL="https\://services.gradle.org/distributions/gradle-6.5.1-all.zip"
export CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL="https\://services.gradle.org/distributions/gradle-7.0.2-all.zip"

file="./build_config"
while IFS="=" read -r key value; do
Expand Down Expand Up @@ -50,7 +50,7 @@ done
rm -rf platforms
#Temporary Workaround to generate build as webpack was complaining of Heap Space
#need to inspect on webpack dependdencies at the earliest
NODE_OPTIONS=--max-old-space-size=4096 ionic cordova platforms add android@9.0.0
NODE_OPTIONS=--max-old-space-size=4096 ionic cordova platforms add android@10.1.2

NODE_OPTIONS=--max-old-space-size=4096 ionic cordova build android --prod --release --verbose --buildConfig ./buildConfig/build.json

Expand Down
8 changes: 4 additions & 4 deletions buildConfig/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ buildscript {

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.android.tools.build:gradle:7.0.0'
}
}

Expand All @@ -38,10 +38,10 @@ allprojects {
}
//This replaces project.properties w.r.t. build settings
project.ext {
defaultBuildToolsVersion="29.0.3" //String
defaultBuildToolsVersion="30.0.3" //String
defaultMinSdkVersion=22 //Integer - Minimum requirement is Android 4.4
defaultTargetSdkVersion=30 //Integer - We ALWAYS target the latest by default
defaultCompileSdkVersion=30 //Integer - We ALWAYS compile with the latest by default
defaultTargetSdkVersion=31 //Integer - We ALWAYS target the latest by default
defaultCompileSdkVersion=31 //Integer - We ALWAYS compile with the latest by default
}
}

Expand Down
11 changes: 5 additions & 6 deletions build_config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
cordova-plugin=cordova-plugin-printer
cordova-plugin=https://github.com/Sunbird-Ed/jjdltc-cordova-plugin-zip.git
cordova-plugin=ionic-plugin-keyboard
cordova-plugin=cordova-plugin-whitelist
cordova-plugin=cordova-plugin-ionic-webview
cordova-plugin=cordova-plugin-app-version
cordova-plugin=cordova-plugin-x-socialsharing
cordova-plugin=cordova-plugin-androidx-adapter
cordova-plugin=cordova-plugin-device
cordova-plugin=cordova-plugin-file
cordova-plugin=cordova-plugin-file-transfer
cordova-plugin=https://github.com/apache/cordova-plugin-file-transfer
cordova-plugin=cordova-plugin-inappbrowser
cordova-plugin=cordova-plugin-network-information
cordova-plugin=cordova-plugin-statusbar
cordova-plugin=cordova-plugin-webview-checker
cordova-plugin=https://github.com/adriano-di-giovanni/cordova-plugin-shared-preferences.git
cordova-plugin=https://github.com/katzer/cordova-plugin-local-notifications.git
cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-3.4.0
cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-5.0.2
cordova-plugin=cordova-plugin-advanced-http
cordova-plugin=cordova-plugin-android-permissions
cordova-plugin=cordova.plugins.diagnostic
Expand All @@ -31,7 +30,7 @@ cordova-plugin=https://github.com/greybax/cordova-plugin-proguard.git
cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-utility.git#release-4.1.0
cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-downloadmanager.git
cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-db.git#release-4.6.0
cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-customtabs.git --variable URL_SCHEME=@string/custom_scheme_url --variable URL_HOST=mobile
cordova-plugin=https://github.com/Sunbird-Ed/sb-cordova-plugin-customtabs#release-5.0.2 --variable URL_SCHEME=@string/custom_scheme_url --variable URL_HOST=mobile
cordova-plugin=cordova-sqlite-storage
cordova plugin=cordova-plugin-googleplus
cordova-pligin=cordova-plugin-camera
Expand All @@ -40,8 +39,8 @@ cordova-plugin=cordova-plugin-filechooser
cordova-plugin=cordova-plugin-media
cordova-plugin=cordova.plugins.diagnostic
sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-openrap.git
sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-qr-scanner.git#release-4.6.0
sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git#release-4.10.1
sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-qr-scanner.git#release-5.0.2
sunbird-cordova-plugin=https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git#release-5.0.2
sunbird-cordova-plugin=https://github.com/project-sunbird/sb-cordova-plugin-sync.git
sunbird-cordova-plugin=https://github.com/subranil/cordova-plugin-inappupdatemanager.git#release-3.7.0
cordova-plugin=uk.co.workingedge.phonegap.plugin.istablet
14 changes: 8 additions & 6 deletions config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<hook src="scripts/copyGradleFiles.js" type="before_run" />
<hook src="scripts/copyBundledData.js" type="before_run" />
<hook src="scripts/application/add_application.js" type="before_run" />
<hook src="scripts/android/android-10-migration-fix.js" type="before_build" />
<resource-file src="MainActivity.java" target="app/src/main/java/org/sunbird/app/MainActivity.java" />
<resource-file src="whitelabel.xml" target="app/src/main/res/values/whitelabel.xml" />
<config-file parent="/manifest/application" target="AndroidManifest.xml">
Expand All @@ -51,6 +52,8 @@
<preference name="loadUrlTimeoutValue" value="700000" />
<preference name="CodePushDeploymentKey" value="agojO-OZt4dZlt_pu9r9j2Ipy_jY90dbb065-3633-45a5-9c55-c0405eafaebb" />
<preference name="AndroidXEnabled" value="true" />
<preference name="AndroidPersistentFileLocation" value="Internal" />
<preference name="AndroidPersistentFileLocation" value="Compatibility" />
<allow-intent href="market:*" />
<icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
<icon density="mdpi" src="resources/android/icon/drawable-ldpi-icon.png" />
Expand Down Expand Up @@ -129,19 +132,18 @@
<content src="index.html" />
<plugin name="cordova-plugin-screen-orientation" spec="^3.0.1" />
<plugin name="cordova-plugin-zip" spec="^3.1.0" />
<plugin name="cordova-plugin-code-push" spec="^1.11.18" />
<plugin name="cordova-plugin-code-push" spec="^2.0.0" />
<plugin name="cordova-plugin-file-opener2" spec="^2.2.0" />
<plugin name="cordova-plugin-printer" spec="^0.8.0" />
<plugin name="com.jjdltc.cordova.plugin.zip" spec="https://github.com/swayangjit/jjdltc-cordova-plugin-zip.git" />
<plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
<plugin name="cordova-plugin-whitelist" spec="^1.3.4" />
<plugin name="cordova-plugin-ionic-webview" spec="^4.2.1" />
<plugin name="cordova-plugin-app-version" spec="^0.1.9" />
<plugin name="cordova-plugin-x-socialsharing" spec="^6.0.3" />
<plugin name="cordova-plugin-androidx-adapter" spec="^1.1.3" />
<plugin name="cordova-plugin-device" spec="^2.0.3" />
<plugin name="cordova-plugin-file" spec="^6.0.2" />
<plugin name="cordova-plugin-file-transfer" spec="^1.7.1" />
<plugin name="cordova-plugin-file" spec="^7.0.0" />
<plugin name="cordova-plugin-file-transfer" spec="https://github.com/apache/cordova-plugin-file-transfer" />
<plugin name="cordova-plugin-inappbrowser" spec="^5.0.0" />
<plugin name="cordova-plugin-network-information" spec="^2.0.2" />
<plugin name="cordova-plugin-statusbar" spec="^2.4.3" />
Expand All @@ -150,11 +152,11 @@
<plugin name="cordova-plugin-local-notification" spec="https://github.com/katzer/cordova-plugin-local-notifications.git">
<variable name="ANDROID_SUPPORT_V4_VERSION" value="26.+" />
</plugin>
<plugin name="cordova-plugin-fcm-with-dependecy-updated" spec="https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-3.4.0">
<plugin name="cordova-plugin-fcm-with-dependecy-updated" spec="https://github.com/Sunbird-Ed/sb-cordova-plugin-fcm.git#release-5.0.2">
<variable name="FCM_CORE_VERSION" value="16.0.9" />
<variable name="FCM_VERSION" value="18.0.0" />
<variable name="GRADLE_TOOLS_VERSION" value="3.5.0" />
<variable name="GOOGLE_SERVICES_VERSION" value="4.2.0" />
<variable name="GOOGLE_SERVICES_VERSION" value="4.3.8" />
<variable name="ANDROID_DEFAULT_NOTIFICATION_ICON" value="@mipmap/ic_launcher" />
</plugin>
<plugin name="cordova-plugin-advanced-http" spec="^2.5.1" />
Expand Down
Loading