Skip to content

Issue #ED-2733 migration: Migration to android SDK-33. #3484

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

Merged
swayangjit merged 1 commit into from
Aug 29, 2023
Merged

Issue #ED-2733 migration: Migration to android SDK-33. #3484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Please describe the tests that you ran to verify your changes in the below check
* Node - 12.22.10
* Java - 11.0.15.1
* Ionic - 5.7.0
* Cordova - 10.1.2
* Cordova - 12.0.0
* Gradle - 7.0.2

### Checklist:
Expand Down
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-7.0.2-all.zip"
export CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL="https\://services.gradle.org/distributions/gradle-7.5.1-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@10.1.2
NODE_OPTIONS=--max-old-space-size=4096 ionic cordova platforms add android@12.0.0

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:7.0.0'
classpath 'com.android.tools.build:gradle:7.3.1'
}
}

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

Expand Down
4 changes: 2 additions & 2 deletions build_config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cordova-plugin=cordova-plugin-x-socialsharing
cordova-plugin=cordova-plugin-androidx-adapter
cordova-plugin=cordova-plugin-device
cordova-plugin=cordova-plugin-file
cordova-plugin=https://github.com/apache/cordova-plugin-file-transfer
cordova-plugin=https://github.com/vishwanath1004/cordova-plugin-file-transfer
cordova-plugin=cordova-plugin-inappbrowser
cordova-plugin=cordova-plugin-network-information
cordova-plugin=cordova-plugin-statusbar
Expand Down Expand Up @@ -40,7 +40,7 @@ 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-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/cordova-plugin-sunbirdsplash.git#release-5.1.0.10
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
38 changes: 17 additions & 21 deletions config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@
<preference name="ScrollEnabled" value="false" />
<preference name="android-minSdkVersion" value="22" />
<preference name="BackupWebStorage" value="none" />
<preference name="SplashScreenDelay" value="5000" />
<preference name="FadeSplashScreen" value="false" />
<preference name="Orientation" value="portrait" />
<preference name="AndroidLaunchMode" value="singleInstance" />
<preference name="KeyboardDisplayRequiresUserAction" value="false" />
<hook src="scripts/copyContentPlayer.js" type="before_build" />
<hook src="scripts/copyContentPlayer.js" type="before_run" />
<platform name="android">
<preference name="android-targetSdkVersion" value="31" />
<preference name="android-targetSdkVersion" value="33" />
<hook src="scripts/deleteUnUsableIosIcon.js" type="before_run" />
<hook src="scripts/deleteUnUsableIosIcon.js" type="before_build" />
<hook src="scripts/android/fix-android-sdk33-migration.js" type="before_run" />
<hook src="scripts/android/fix-android-sdk33-migration.js" type="before_build" />
<hook src="scripts/copyGradleFiles.js" type="before_build" />
<hook src="scripts/copyBundledData.js" type="before_build" />
<hook src="scripts/copyGradleFiles.js" type="before_run" />
Expand Down Expand Up @@ -52,26 +54,21 @@
<preference name="android-manifest/application/@android:allowBackup" value="false" />
<preference name="loadUrlTimeoutValue" value="700000" />
<preference name="CodePushDeploymentKey" value="agojO-OZt4dZlt_pu9r9j2Ipy_jY90dbb065-3633-45a5-9c55-c0405eafaebb" />
<preference name="AndroidWindowSplashScreenAnimationDuration" value="5000" />
<preference name="AndroidXEnabled" value="true" />
<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" />
<icon density="hdpi" src="resources/android/icon/drawable-ldpi-icon.png" />
<icon density="xhdpi" src="resources/android/icon/drawable-ldpi-icon.png" />
<icon density="xxhdpi" src="resources/android/icon/drawable-ldpi-icon.png" />
<icon density="xxxhdpi" src="resources/android/icon/drawable-ldpi-icon.png" />
<splash density="land-ldpi" src="resources/android/splash/drawable-ldpi-splash.png" />
<splash density="land-mdpi" src="resources/android/splash/drawable-ldpi-splash.png" />
<splash density="land-hdpi" src="resources/android/splash/drawable-hdpi-splash.png" />
<splash density="land-xhdpi" src="resources/android/splash/drawable-hdpi-splash.png" />
<splash density="land-xxhdpi" src="resources/android/splash/drawable-xhdpi-splash.png" />
<splash density="land-xxxhdpi" src="resources/android/splash/drawable-xhdpi-splash.png" />
<splash density="port-ldpi" src="resources/android/splash/drawable-ldpi-splash.png" />
<splash density="port-mdpi" src="resources/android/splash/drawable-ldpi-splash.png" />
<splash density="port-hdpi" src="resources/android/splash/drawable-hdpi-splash.png" />
<splash density="port-xhdpi" src="resources/android/splash/drawable-hdpi-splash.png" />
<splash density="port-xxhdpi" src="resources/android/splash/drawable-xhdpi-splash.png" />
<splash density="port-xxxhdpi" src="resources/android/splash/drawable-xhdpi-splash.png" />
<icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.xml" />
<icon density="mdpi" src="resources/android/icon/drawable-ldpi-icon.xml" />
<icon density="hdpi" src="resources/android/icon/drawable-ldpi-icon.xml" />
<icon density="xhdpi" src="resources/android/icon/drawable-ldpi-icon.xml" />
<icon density="xxhdpi" src="resources/android/icon/drawable-ldpi-icon.xml" />
<icon density="xxxhdpi" src="resources/android/icon/drawable-ldpi-icon.xml" />
<preference name="AutoHideSplashScreen" value="true" />
<preference name="AndroidWindowSplashScreenBackground" value="#ffffff" />
<preference name="FadeSplashScreen" value="false" />
<preference name="SplashScreen" value="resources/android/splash/drawable-ldpi-splash.png" />
<preference name="SplashScreen" value="resources/android/splash/drawable-hdpi-splash.png" />
<preference name="AndroidWindowSplashScreenAnimatedIcon" value="resources/android/splash/drawable-ldpi-splash.png" />
<resource-file src="resources/android/icon/mipmap-hdpi-icon.png" target="app/src/main/res/mipmap-hdpi/n_icon.png" />
<resource-file src="resources/android/xml/network_security_config.xml" target="app/src/main/res/xml/network_security_config.xml" />
</platform>
Expand Down Expand Up @@ -176,7 +173,6 @@
</plugin>
<plugin name="cordova-plugin-openrap" spec="https://github.com/project-sunbird/cordova-plugin-openrap.git" />
<plugin name="cordova-plugin-qr-scanner" spec="https://github.com/project-sunbird/cordova-plugin-qr-scanner.git#release-3.3.0" />
<plugin name="cordova-plugin-sunbirdsplash" spec="https://github.com/project-sunbird/cordova-plugin-sunbirdsplash.git#release-4.10.1" />
<plugin name="sb-cordova-plugin-sync" spec="https://github.com/project-sunbird/sb-cordova-plugin-sync.git#release-3.2.0" />
<plugin name="cordova-plugin-inappupdatemanager" spec="https://github.com/subranil/cordova-plugin-inappupdatemanager.git" />
<plugin name="cordova-sqlite-storage" spec="^6.0.0" />
Expand Down
Loading