Release 3.9.0 ios

.circleci/config.yml

@@ -28,7 +28,7 @@ jobs:
           path: coverage
       - run:
           name: install sonar scanner
-          command: sudo npm install -g sonarqube-scanner@2.5.0
+          command: sudo npm install -g sonarqube-scanner@2.7.0
       - run:
           name: Run SonarScan
           command: sonar-scanner

.gitignore

@@ -42,6 +42,8 @@ UserInterfaceState.xcuserstate
 /src/assets/data/
 
 google-services.json
+GoogleService-Info.plist
 
 #sonarcloud
 .scannerwork
+

README.md

@@ -1,5 +1,3 @@
-[![Sonarcloud Status](https://sonarcloud.io/api/project_badges/measure?project=Sunbird-Ed_SunbirdEd-mobile-app&metric=alert_status)](https://sonarcloud.io/dashboard?id=Sunbird-Ed_SunbirdEd-mobile-app)
-
 **Dependencies:**    
 NPM Version - above 6    
 Node JS Version - above 8    
@@ -36,3 +34,51 @@ Node JS Version - above 8
 **4. How to debug apk**    
     - Open chrome and enter `chrome://inspect`    
     - Select app    
+
+
+
+
+
+---------------------------------------
+
+# IOS Development setup
+
+## Prerequisites
+
+    1. Node js version 10.18.1
+    2. Ionic 5.4.16 using `npm i [email protected] -g`
+    3. Cordova 9.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`
+
+    all of the above should be installed globally
+
+    Xcode 12.4 Build version 12D4e or above
+
+## Steps
+
+    1. Checkout sunbird-sdk repo from https://github.com/shikshalokam/sunbird-mobile-sdk with branch release-3.9.0-ios
+    2. cd to <sunbird-mobile-sdk> && npm i && npm run build:prod
+    3. Checkout sunbird-mobile-app repo from https://github.com/shikshalokam/SunbirdEd-mobile-app with branch release-3.9.0-ios
+    4. Add `GoogleService-Info.plist` file
+    5. cd to <sunbird-mobile-app> local path
+    6. RUN npm i <sunbird-sdk repo local path>/dist
+    7. RUN npm i
+    8. RUN ./build-ios.sh
+    9. RUN cordova emulate ios
+
+
+## Possible Errors 
+
+1. error: Value for SWIFT_VERSION cannot be empty. (in target 'Sunbird' from project 'Sunbird') or Duplicate GoogleService-Info.plist file error
+
+### Solution
+    open platforms/ios/Sunbird.xcworkspace 
+
+    Select Sunbird 
+    Build setting Project, targets
+    update Swift language version to 4 
+    Inside Tagets -> Build phases -> Copy Bundle Resources -> remove duplicate GoogleService-Info.plist if present
+    and close Xcode then rerun the **cordova emulate ios**
+
+

angular.json

@@ -40,8 +40,28 @@
               },
               {
                 "glob": "**/*.*",
-                "input": "./node_modules/@project-sunbird/common-consumption/assets",
+                "input": "./node_modules/@project-sunbird/common-consumption-v8/assets",
                 "output": "./assets/common-consumption"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/@project-sunbird/sunbird-pdf-player-v8/lib/assets/",
+                "output": "/assets/"
+              },
+              {
+                "glob": "**/*.*",
+                "input": "./node_modules/@project-sunbird/discussions-ui-v8/assets",
+                "output": "./assets/discussion-ui"
+              },
+              {
+                "glob": "**/*",
+                "input": "./node_modules/@project-sunbird/sunbird-quml-player-v8/lib/assets/",
+                "output": "/assets/"
+              },
+              {
+                "glob": "**/*",
+                "input": "./node_modules/@project-sunbird/sunbird-video-player-v8/lib/assets/",
+                "output": "/assets/"
               }
             ],
 
@@ -51,21 +71,29 @@
               "vendor": true
             },
             "styles": [
-              "node_modules/common-consumption-styles/assets/_styles.scss",
+              "src/assets/styles/quml-styles/quml-carousel.css",
+              "node_modules/katex/dist/katex.min.css",
+              "node_modules/video.js/dist/video-js.min.css",
+              "node_modules/@project-sunbird/sb-styles/assets/_styles.scss",
+              "node_modules/@project-sunbird/discussions-ui-v8/assets/styles/global.scss",
               {
                 "input": "src/global.scss"
               }
             ],
-            "scripts": [],
+            "scripts": [
+              "node_modules/@project-sunbird/telemetry-sdk/index.js",
+              "node_modules/epubjs/dist/epub.js",
+              "node_modules/katex/dist/katex.min.js"
+            ],
             "es5BrowserSupport": true,
             "preserveSymlinks": true
           },
           "configurations": {
             "production": {
               "fileReplacements": [
                 {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
+                  "replace": "src/configuration/configuration.ts",
+                  "with": "src/configuration/configuration.prod.ts"
                 }
               ],
               "optimization": true,
@@ -81,15 +109,23 @@
                 {
                   "type": "initial",
                   "maximumWarning": "2mb",
-                  "maximumError": "7mb"
+                  "maximumError": "8mb"
                 }
               ]
             },
             "hmr": {
               "fileReplacements": [
                 {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.hmr.ts"
+                  "replace": "src/configuration/configuration.ts",
+                  "with": "src/configuration/configuration.hmr.ts"
+                }
+              ]
+            },
+            "debug": {
+              "fileReplacements": [
+                {
+                  "replace": "src/configuration/configuration.ts",
+                  "with": "src/configuration/configuration.debug.ts"
                 }
               ]
             },
@@ -218,6 +254,7 @@
     }
   },
   "cli": {
+    "analytics": "75c63db4-656e-490e-a5b9-bda28ceec150",
     "defaultCollection": "@ionic/angular-toolkit"
   },
   "schematics": {

build-ios.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# Accepted CLI arguments
+while getopts a: flag
+do
+    case "${flag}" in
+        a) angularConfiguration=${OPTARG};;
+    esac
+done
+
+# Simple script to clean install
+rm -rf node_modules
+rm -rf platforms
+rm -rf plugins
+rm -rf www
+
+CORDOVA_COUNTER=0
+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"
+
+file="./build_config"
+while IFS="=" read -r key value; do
+  case "$key" in
+    '#'*) ;;
+    'cordova'*)
+      CORDOVA[$CORDOVA_COUNTER]=$value
+      CORDOVA_COUNTER=$((CORDOVA_COUNTER+1));;
+    'sunbird-cordova'*)
+      SUNBIRD_CORDOVA[$SUNBIRD_CORDOVA_COUNTER]=$value
+      SUNBIRD_CORDOVA_COUNTER=$((SUNBIRD_CORDOVA_COUNTER+1));
+  esac
+done < "$file"
+
+
+for cordova_plugin in "${CORDOVA[@]}"
+do
+  ionic cordova plugin add $cordova_plugin --force
+done
+
+for cordova_plugin in "${SUNBIRD_CORDOVA[@]}"
+do
+  ionic cordova plugin add $cordova_plugin
+done
+
+rm -rf platforms
+mkdir 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 ios
+
+NODE_OPTIONS=--max-old-space-size=4096 ionic cordova build ios
+

build.sh

@@ -1,5 +1,13 @@
 #!/bin/bash
 
+# Accepted CLI arguments
+while getopts a: flag
+do
+    case "${flag}" in
+        a) angularConfiguration=${OPTARG};;
+    esac
+done
+
 # Simple script to clean install
 rm -rf node_modules
 rm -rf platforms
@@ -11,7 +19,8 @@ SUNBIRD_CORDOVA_COUNTER=0
 
 # Pass build branch as input
 buildBranch="$1"
-npm install
+rm package-lock.json && npm install
+export CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL="https\://services.gradle.org/distributions/gradle-6.5.1-all.zip"
 
 file="./build_config"
 while IFS="=" read -r key value; do
@@ -39,12 +48,16 @@ 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@8.1.0
+NODE_OPTIONS=--max-old-space-size=4096 ionic cordova platforms add android@9.0.0
 
 NODE_OPTIONS=--max-old-space-size=4096 ionic cordova build android --prod --release --buildConfig ./buildConfig/build.json
 
-npm run ionic-build
+if [ -n "$angularConfiguration" ]; then
+  echo "$angularConfiguration"
+  npm run ionic-build --angular-configuration=$angularConfiguration
+else
+  npm run ionic-build --angular-configuration=production
+fi
 

buildConfig/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>buildConfig_</name>
+	<comment>Project buildConfig_ created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

buildConfig/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(LOCAL_INSTALLATION(/Users/pacewisdom/.sdkman/candidates/gradle/current))
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=/Library/Java/JavaVirtualMachines/jdk-15.0.2.jdk/Contents/Home
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true