Issue #SB-000 merge: Resolved merge conflicts.

Sunbird-Ed · May 29, 2024 · d56d2ad · d56d2ad
1 parent a72ecee
commit d56d2ad
Show file tree

Hide file tree

Showing 7 changed files with 372 additions and 739 deletions.
diff --git a/android/app/build.gradle b/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
 

diff --git a/android/app/capacitor.build.gradle b/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"
 

diff --git a/android/capacitor.settings.gradle b/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')
 

diff --git a/angular.json b/angular.json
@@ -81,7 +81,7 @@
               "node_modules/videojs-http-source-selector/dist/videojs-http-source-selector.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/dataTables.dataTables.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",