Merge pull request #2326 from moodlehq/integration

Integration
moodlehq · Mar 30, 2020 · 5dfccb1 · 5dfccb1
2 parents 4ed3108 + 1005690
commit 5dfccb1
Show file tree

Hide file tree

Showing 366 changed files with 12,491 additions and 6,034 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-sudo: required
+os: linux
 dist: bionic
 group: edge
 
@@ -23,4 +23,3 @@ script:
 
 after_success:
   - scripts/ci.sh
-
diff --git a/GoogleService-Info.plist b/GoogleService-Info.plist
@@ -2,39 +2,39 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>AD_UNIT_ID_FOR_BANNER_TEST</key>
-	<string>ca-app-pub-3940256099942544/2934735716</string>
-	<key>AD_UNIT_ID_FOR_INTERSTITIAL_TEST</key>
-	<string>ca-app-pub-3940256099942544/4411468910</string>
-	<key>CLIENT_ID</key>
-	<string>694767596569-c2cjrca92k99f6nkp3363lsb7ljhdgdr.apps.googleusercontent.com</string>
-	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.694767596569-c2cjrca92k99f6nkp3363lsb7ljhdgdr</string>
-	<key>API_KEY</key>
-	<string>AIzaSyA-77ZjkxII6GV97CC9rdUl83rzdEXu_rM</string>
-	<key>GCM_SENDER_ID</key>
-	<string>694767596569</string>
-	<key>PLIST_VERSION</key>
-	<string>1</string>
-	<key>BUNDLE_ID</key>
-	<string>com.moodle.moodlemobile</string>
-	<key>PROJECT_ID</key>
-	<string>moodlemobile-push</string>
-	<key>STORAGE_BUCKET</key>
-	<string>moodlemobile-push.appspot.com</string>
-	<key>IS_ADS_ENABLED</key>
-	<true></true>
-	<key>IS_ANALYTICS_ENABLED</key>
-	<false></false>
-	<key>IS_APPINVITE_ENABLED</key>
-	<true></true>
-	<key>IS_GCM_ENABLED</key>
-	<true></true>
-	<key>IS_SIGNIN_ENABLED</key>
-	<true></true>
-	<key>GOOGLE_APP_ID</key>
-	<string>1:694767596569:ios:a4cdad4d168c9d1a</string>
-	<key>DATABASE_URL</key>
-	<string>https://moodlemobile-push.firebaseio.com</string>
+    <key>AD_UNIT_ID_FOR_BANNER_TEST</key>
+    <string></string>
+    <key>AD_UNIT_ID_FOR_INTERSTITIAL_TEST</key>
+    <string></string>
+    <key>CLIENT_ID</key>
+    <string></string>
+    <key>REVERSED_CLIENT_ID</key>
+    <string></string>
+    <key>API_KEY</key>
+    <string></string>
+    <key>GCM_SENDER_ID</key>
+    <string></string>
+    <key>PLIST_VERSION</key>
+    <string>1</string>
+    <key>BUNDLE_ID</key>
+    <string>com.moodle.moodlemobile</string>
+    <key>PROJECT_ID</key>
+    <string>moodlemobile-push</string>
+    <key>STORAGE_BUCKET</key>
+    <string></string>
+    <key>IS_ADS_ENABLED</key>
+    <false></false>
+    <key>IS_ANALYTICS_ENABLED</key>
+    <false></false>
+    <key>IS_APPINVITE_ENABLED</key>
+    <false></false>
+    <key>IS_GCM_ENABLED</key>
+    <false></false>
+    <key>IS_SIGNIN_ENABLED</key>
+    <false></false>
+    <key>GOOGLE_APP_ID</key>
+    <string></string>
+    <key>DATABASE_URL</key>
+    <string></string>
 </dict>
 </plist>
diff --git a/PACKAGE_PROBLEMS.md b/PACKAGE_PROBLEMS.md
@@ -0,0 +1,15 @@
+Package updates known problems
+=================
+
+@ionic/app-scripts 3.2.3 shows error Cannot find type definition file for '@types'. on ngc build.
+
+com-darryncampbell-cordova-plugin-intent 2.0.0 onwards needs Android X Support. Unsupported on PGB.
+
+typescript is needed to be less than 2.7 for @angular/compiler-cli
+
+cordova-plugin-ionic-keyboard has problems on greater versions than 2.1.3
+
+jszip has problems with "lie" dependency on greater versions than 3.1
+
+promise.prototype.finally has problems on greater versions than 3.1
+
diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.moodle.moodlemobile" version="3.8.0" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.moodle.moodlemobile" version="3.8.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Moodle</name>
     <description>Moodle official app</description>
     <author email="mobile@moodle.com" href="http://moodle.com">Moodle Mobile team</author>
@@ -23,7 +23,7 @@
     <preference name="webviewbounce" value="false" />
     <preference name="AppendUserAgent" value="MoodleMobile" />
     <preference name="android-minSdkVersion" value="19" />
-    <preference name="android-targetSdkVersion" value="28" />
+    <preference name="android-targetSdkVersion" value="29" />
     <preference name="UIWebViewBounce" value="false" />
     <preference name="DisallowOverscroll" value="true" />
     <preference name="BackupWebStorage" value="none" />
@@ -122,6 +122,9 @@
         <edit-config file="*-Info.plist" mode="merge" target="NSLocationWhenInUseUsageDescription">
             <string>We need your location so you can attach it as part of your submissions.</string>
         </edit-config>
+        <edit-config file="*-Info.plist" mode="merge" target="NSLocationAlwaysUsageDescription">
+            <string>We need your location so you can attach it as part of your submissions.</string>
+        </edit-config>
         <icon height="20" src="resources/ios/icon/icon-20.png" width="20" />
         <icon height="40" src="resources/ios/icon/icon-20@2x.png" width="40" />
         <icon height="60" src="resources/ios/icon/icon-20@3x.png" width="60" />
@@ -181,9 +184,6 @@
     <edit-config file="AndroidManifest.xml" mode="merge" target="/manifest/application">
         <application android:usesCleartextTraffic="true" />
     </edit-config>
-    <edit-config file="AndroidManifest.xml" mode="overwrite" target="/manifest/uses-feature[@android:name='android.hardware.location.gps']">
-        <uses-feature android:name="android.hardware.location.gps" android:required="false" />
-    </edit-config>
     <config-file parent="/manifest/application" target="AndroidManifest.xml">
         <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
     </config-file>

diff --git a/config/sass.config.js b/config/sass.config.js
@@ -5,5 +5,11 @@ module.exports = {
     'node_modules/ionicons/dist/scss',
     'node_modules/ionic-angular/fonts',
     'node_modules/font-awesome/scss'
+  ],
+  includeFiles: [
+    /\.(s(c|a)ss)$/i
+  ],
+  excludeFiles: [
+      /\.(wp).(scss)$/i
   ]
 };
diff --git a/config/uglifyjs.config.js b/config/uglifyjs.config.js
@@ -0,0 +1,19 @@
+// Check https://github.com/mishoo/UglifyJS2/tree/harmony#minify-options-structure
+module.exports = {
+    /**
+     * mangle: uglify 2's mangle option
+     */
+    mangle: {
+      keep_classnames: true,
+      keep_fnames: true
+    },
+    /**
+     * compress: uglify 2's compress option
+     */
+    compress: {
+      toplevel: true,
+      pure_getters: true
+    },
+    keep_classnames: true,
+    keep_fnames: true
+}
diff --git a/desktop/assets/windows/AppXManifest.xml b/desktop/assets/windows/AppXManifest.xml
@@ -6,7 +6,7 @@
   <Identity Name="3312ADB7.MoodleDesktop"
     ProcessorArchitecture="x64"
     Publisher="CN=33CDCDF6-1EB5-4827-9897-ED25C91A32F6"
-    Version="3.8.0.0" />
+    Version="3.8.1.0" />
   <Properties>
     <DisplayName>Moodle Desktop</DisplayName>
     <PublisherDisplayName>Moodle Pty Ltd.</PublisherDisplayName>

diff --git a/google-services.json b/google-services.json
@@ -1,30 +1,30 @@
 {
   "project_info": {
-    "project_number": "694767596569",
-    "firebase_url": "https://moodlemobile-push.firebaseio.com",
-    "project_id": "moodlemobile-push",
-    "storage_bucket": "moodlemobile-push.appspot.com"
+    "project_number": "",
+    "firebase_url": "",
+    "project_id": "",
+    "storage_bucket": ""
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:694767596569:android:a4cdad4d168c9d1a",
+        "mobilesdk_app_id": "1:111111111111:android:1111111111111111",
         "android_client_info": {
           "package_name": "com.moodle.moodlemobile"
         }
       },
       "oauth_client": [
         {
-          "client_id": "694767596569-icveqqa2n56oh44l6ev1dr2oh67nh8il.apps.googleusercontent.com",
+          "client_id": "",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyCb2zogu0P_aZ2LNgdwzshWExITPKTXJyk"
+          "current_key": ""
         },
         {
-          "current_key": "AIzaSyDRT1HwT0gSsTty0whOVtoNKAh8SPrJXLE"
+          "current_key": ""
         }
       ],
       "services": {

diff --git a/gulpfile.js b/gulpfile.js
@@ -5,12 +5,12 @@ var gulp = require('gulp'),
     path = require('path'),
     slash = require('gulp-slash'),
     clipEmptyFiles = require('gulp-clip-empty-files'),
-    gutil = require('gulp-util'),
+    File = require('vinyl'),
     flatten = require('gulp-flatten'),
     npmPath = require('path'),
     concat = require('gulp-concat'),
-    bufferFrom = require('buffer-from')
-    File = gutil.File,
+    htmlmin = require('gulp-htmlmin'),
+    bufferFrom = require('buffer-from'),
     exec = require('child_process').exec,
     license = '' +
         '// (C) Copyright 2015 Moodle Pty Ltd.\n' +
@@ -294,6 +294,12 @@ gulp.task('copy-component-templates', function(done) {
 
     gulp.src(templatesSrc, { allowEmpty: true })
         .pipe(flatten())
+        // Check options here: https://github.com/kangax/html-minifier
+        .pipe(htmlmin({
+          collapseWhitespace: true,
+          removeComments: true,
+          caseSensitive: true
+        }))
         .pipe(gulp.dest(templatesDest))
         .on('end', done);
 });
@@ -311,6 +317,11 @@ function getReplace(capture, baseDir, paths, parsedFiles) {
     var parse   = path.parse(path.resolve(baseDir, capture + '.scss'));
     var file    = parse.dir + '/' + parse.name;
 
+    if (file.slice(-3) === '.wp') {
+        console.log('Windows Phone not supported "' + capture);
+        // File was already parsed, leave the import commented.
+        return '// @import "' + capture + '";';
+    }
 
     if (!fs.existsSync(file + '.scss')) {
         // File not found, might be a partial file.