Issue #SB-000 merge: Merge pull request #3628 from swayangjit/release…

…-8.0.0_capacitor_ml

Issue #SB-000 merge: Resolved merge conflicts.

.github/pull_request_template.md

@@ -17,7 +17,7 @@ Please describe the tests that you ran to verify your changes in the below check
 - [ ] Ran Test B
 
 **Test Configuration**:
-* Node - 12.22.10
+* Node - 16.20.0
 * Java - 11.0.15.1
 * Ionic - 5.7.0
 * Cordova - 12.0.0

README.md

@@ -16,8 +16,8 @@ Ongoing release- [release-6.0.0](https://github.com/Sunbird-Ed/SunbirdEd-mobile-
 **Prerequisites:**
 |Package| Version | Recommended  Version |
 |--|--|--|
-[Node](https://nodejs.org/en/) | 12+ | 12.22.10
-[NPM](https://nodejs.org/en/) | 6+ | 6.14.16
+[Node](https://nodejs.org/en/) | 16+ | 16.20.0
+[NPM](https://nodejs.org/en/) | 9+ | 9.5.1
 [Cordova](https://cordova.apache.org/) | 10+ | 10.1.2
 [Ionic](https://ionicframework.com/docs/intro/cli) | 5 | 5.7.0
 [Java(For Android)](https://www.oracle.com/in/java/technologies/downloads/) | 11+ | 11.0.15.1
@@ -178,8 +178,8 @@ Configure the tabs page according to the requirement. Fllowing are the configura
 ---------------------------------------
 ## IOS Development setup
 ## Prerequisites
-    1. Node js version 14.20.1
-    2. Ionic 5.4.16 using `npm i ionic@5.4.16 -g`
+    1. Node js version 16.20.0
+    2. Ionic 7.1.5 using `npm i ionic@5.7.0 -g`
     3. Cordova 11.0.0  using `npm i [email protected] -g`
     4. cordova-res 0.15.3 - using `npm install -g cordova-res`
     5. ios-deploy  1.11.4 - using `brew install ios-deploy`

android/app/build-extras.gradle

@@ -300,7 +300,7 @@ android {
             println "inside copydir staging windows OS"
         } else {
             from "$rootDir/app/data/staging"
-            into "$rootDir/app/src/main/assets/www/assets/data"
+            into "$rootDir/app/src/main/assets/public/assets/data"
             println "inside copydir staging linux OS"
         }
     }

android/app/build.gradle

@@ -16,7 +16,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
 		versionCode 1
         ext.buildNumber = System.getenv("TRAVIS_BUILD_NUMBER") ?: "local"
-		versionName "8.0.local"
+		versionName "6.0.local"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
@@ -36,15 +36,15 @@ android {
         }
     }
  applicationVariants.configureEach { variant ->
-        def artifactName = "${app_name.toLowerCase()}-${variant.getVersionName()}-${variant.buildType.name}"
-        variant.outputs.configureEach {
-            outputFileName = "${artifactName}.apk"
-        }
-        tasks.named("sign${variant.name.capitalize()}Bundle", FinalizeBundleTask) {
-            File file = finalBundleFile.asFile.get()
-            File finalFile = new File(file.parentFile, "${artifactName}.aab")
-            finalBundleFile.set(finalFile)
-        }
+        // def artifactName = "${app_name.toLowerCase()}-${variant.getVersionName()}-${variant.buildType.name}"
+        // variant.outputs.configureEach {
+        //     outputFileName = "${artifactName}.apk"
+        // }
+        // tasks.named("sign${variant.name.capitalize()}Bundle", FinalizeBundleTask) {
+        //     File file = finalBundleFile.asFile.get()
+        //     File finalFile = new File(file.parentFile, "${artifactName}.aab")
+        //     finalBundleFile.set(finalFile)
+        // }
     }
 } // android
 

android/app/capacitor.build.gradle

@@ -16,6 +16,7 @@ dependencies {
     implementation project(':capacitor-browser')
     implementation project(':capacitor-camera')
     implementation project(':capacitor-device')
+    implementation project(':capacitor-filesystem')
     implementation project(':capacitor-haptics')
     implementation project(':capacitor-keyboard')
     implementation project(':capacitor-local-notifications')
@@ -32,18 +33,17 @@ dependencies {
     implementation "com.google.android.gms:play-services-auth:15.0.1"
     implementation "com.google.android.gms:play-services-identity:15.0.1"
     implementation "com.google.android.play:core:1.9.1"
+    implementation "com.android.support:support-v4:28.+"
     implementation "com.android.support:appcompat-v7:27.+"
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "androidx.browser:browser:1.0.0"
-    implementation "androidx.appcompat:appcompat:1.3.1"
     implementation "com.android.installreferrer:installreferrer:1.1"
     implementation "com.google.android.gms:play-services-safetynet:16.0.0"
     implementation "com.google.android.play:core:1.6.1"
 }
 apply from: "../../node_modules/cordova-plugin-qr-scanner/build-extras.gradle"
 apply from: "../../node_modules/com-sarriaroman-photoviewer/src/android/photoviewer.gradle"
 apply from: "../../node_modules/cordova-plugin-fcm-with-dependecy-updated/src/android/FCMPlugin.gradle"
-apply from: "../../node_modules/cordova-plugin-code-push/src/android/build-extras.gradle"
 apply from: "../../node_modules/cordova-plugin-telerik-imagepicker/src/android/ignorelinterrors.gradle"
 apply from: "../../node_modules/cordova-plugin-telerik-imagepicker/src/android/androidtarget.gradle"
 

android/capacitor.settings.gradle

@@ -23,6 +23,9 @@ project(':capacitor-camera').projectDir = new File('../node_modules/@capacitor/c
 include ':capacitor-device'
 project(':capacitor-device').projectDir = new File('../node_modules/@capacitor/device/android')
 
+include ':capacitor-filesystem'
+project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacitor/filesystem/android')
+
 include ':capacitor-haptics'
 project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/haptics/android')
 

angular.json

@@ -79,9 +79,9 @@
               "node_modules/@project-sunbird/discussions-ui/assets/styles/global.scss",
               "node_modules/@project-sunbird/sunbird-video-player-web-component/styles.css",
               "node_modules/videojs-http-source-selector/dist/videojs-http-source-selector.css",
-              "node_modules/datatables.net-dt/css/jquery.dataTables.css",
               "node_modules/@project-sunbird/sb-themes/themes/themes-df.scss",   
               "node_modules/@project-sunbird/sunbird-epub-player-web-component/styles.css",
+              "node_modules/datatables.net-dt/css/jquery.dataTables.css",
               "node_modules/@project-sunbird/sunbird-quml-player-web-component/styles.css",
               "node_modules/@project-sunbird/sunbird-pdf-player-web-component/styles.css",
               "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
@@ -94,7 +94,7 @@
               "node_modules/epubjs/dist/epub.js",
               "node_modules/katex/dist/katex.min.js",
               "node_modules/jquery/dist/jquery.min.js",
-              "node_modules/datatables.net/js/jquery.dataTables.js",
+              "node_modules/datatables.net/js/dataTables.js",
               "node_modules/video.js/dist/video.js",
               "node_modules/@project-sunbird/sunbird-video-player-web-component/sunbird-video-player.js",
               "node_modules/videojs-contrib-quality-levels/dist/videojs-contrib-quality-levels.min.js",