From 12baf2270e7adef2fe8b59b2d216322697b90b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 1 Dec 2020 14:07:16 +0100 Subject: [PATCH 1/3] MOBILE-3617 travis: Simplify travis yml --- .travis.yml | 52 +++------------------------------------------------- 1 file changed, 3 insertions(+), 49 deletions(-) diff --git a/.travis.yml b/.travis.yml index 92b586c86..0df08befe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,43 +19,35 @@ git: depth: 3 before_cache: - - rm -rf $HOME/.cache/electron-builder/wine - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ cache: directories: - $HOME/.npm - - $HOME/.cache/electron - - $HOME/.cache/electron-builder - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ - $HOME/.android/build-cache before_script: - - if [ "$TRAVIS_OS_NAME" != 'windows' ] ; then npm install npm@latest -g ; fi + - npm install npm@latest -g - gulp jobs: include: - stage: check if: NOT branch =~ /(master|integration|desktop)$/ AND env(DEPLOY) IS blank - os: linux script: npm run build --bailOnLintError true --typeCheckOnLint true - stage: mirror if: branch IN (master, integration, desktop) AND repo = moodlehq/moodleapp AND type != cron - os: linux script: scripts/mirror.sh - stage: prepare - if: branch =~ /(master|^integration)$/ AND env(PREPARE) IS NOT blank AND env(PREPARE) = 1 AND type != cron - os: linux + if: branch =~ /(master|^integration)$/ AND env(PREPARE) IS present AND env(PREPARE) = 1 AND type != cron AND tag IS blank script: scripts/aot.sh - stage: build name: "Build Android" - if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND branch != desktop) OR (env(DEPLOY) IN (2,3) AND tag IS NOT blank)) - os: linux + if: env(DEPLOY) IS present AND type != cron AND ((env(DEPLOY) = 1 AND tag IS blank) OR (env(DEPLOY) = 2 AND tag IS present)) dist: trusty - group: edge language: android env: - BUILD_PLATFORM='android' @@ -67,44 +59,6 @@ jobs: - npm ci - npm install -g gulp script: scripts/aot.sh - - stage: build - name: "Build iOS" - if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND branch != desktop) OR (env(DEPLOY) IN (2,3) AND tag IS NOT blank)) - os: osx - osx_image: xcode12.2 - env: - - BUILD_PLATFORM='ios' - script: scripts/aot.sh - - stage: build - name: "Build Linux" - if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND branch = desktop) OR (env(DEPLOY) = 3 AND tag IS NOT blank)) - os: linux - env: - - ELECTRON_CACHE=$HOME/.cache/electron - - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder - - BUILD_PLATFORM='linux' - script: scripts/aot.sh - - stage: build - name: "Build MacOS" - if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND branch = desktop) OR (env(DEPLOY) = 3 AND tag IS NOT blank)) - os: osx - osx_image: xcode12.2 - env: - - ELECTRON_CACHE=$HOME/.cache/electron - - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder - - BUILD_PLATFORM='osx' - script: scripts/aot.sh - - stage: build - name: "Build Windows" - if: env(DEPLOY) IS NOT blank AND ((env(DEPLOY) = 1 AND branch = desktop) OR (env(DEPLOY) = 3 AND tag IS NOT blank)) - os: windows - env: - - ELECTRON_CACHE=$HOME/.cache/electron - - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder - - ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true - - DEBUG=electron-windows-store - - BUILD_PLATFORM='windows' - script: scripts/aot.sh - stage: test name: "End to end tests (mod_forum, mod_messages and mod_comments)" services: From 78d41bddac5c335c0b358df698c6583bc760ad1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 3 Dec 2020 12:35:19 +0100 Subject: [PATCH 2/3] MOBILE-3617 lang: Update other component languages --- scripts/lang_functions.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/lang_functions.php b/scripts/lang_functions.php index 668070a60..17d6d8d2c 100644 --- a/scripts/lang_functions.php +++ b/scripts/lang_functions.php @@ -400,6 +400,9 @@ function override_component_lang_files($keys, $translations) { case 'assets': $path .= $type.'/'.$component; break; + default: + $path .= $type.'/lang'; + break; } From 275639517541bf3c2c6d5a299ae6c0ba676e14ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 3 Dec 2020 11:02:30 +0100 Subject: [PATCH 3/3] MOBILE-3617 login: Use login helper singleton on course helper --- src/core/course/providers/helper.ts | 7 +++---- src/core/login/providers/helper.ts | 3 +++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/core/course/providers/helper.ts b/src/core/course/providers/helper.ts index 87fcd202e..db2046f87 100644 --- a/src/core/course/providers/helper.ts +++ b/src/core/course/providers/helper.ts @@ -34,7 +34,7 @@ import { CoreCourseProvider } from './course'; import { CoreCourseOfflineProvider } from './course-offline'; import { CoreCourseModuleDelegate } from './module-delegate'; import { CoreCourseModulePrefetchDelegate } from './module-prefetch-delegate'; -import { CoreLoginHelperProvider } from '@core/login/providers/helper'; +import { CoreLoginHelper, CoreLoginHelperProvider } from '@core/login/providers/helper'; import { CoreConstants } from '@core/constants'; import { CoreSite } from '@classes/site'; import { CoreLoggerProvider } from '@providers/logger'; @@ -122,7 +122,6 @@ export class CoreCourseHelperProvider { private timeUtils: CoreTimeUtilsProvider, private utils: CoreUtilsProvider, private translate: TranslateService, - private loginHelper: CoreLoginHelperProvider, private courseOptionsDelegate: CoreCourseOptionsDelegate, private siteHomeProvider: CoreSiteHomeProvider, private eventsProvider: CoreEventsProvider, @@ -1302,7 +1301,7 @@ export class CoreCourseHelperProvider { if (courseId == site.getSiteHomeId()) { // Check if site home is available. return this.siteHomeProvider.isAvailable().then(() => { - this.loginHelper.redirect('CoreSiteHomeIndexPage', params, siteId); + CoreLoginHelper.instance.redirect('CoreSiteHomeIndexPage', params, siteId); }).finally(() => { modal.dismiss(); }); @@ -1610,7 +1609,7 @@ export class CoreCourseHelperProvider { params = params || {}; Object.assign(params, { course: course }); - return this.loginHelper.redirect(CoreLoginHelperProvider.OPEN_COURSE, params, siteId); + return CoreLoginHelper.instance.redirect(CoreLoginHelperProvider.OPEN_COURSE, params, siteId); } } diff --git a/src/core/login/providers/helper.ts b/src/core/login/providers/helper.ts index 05c517d98..84c2e0aca 100644 --- a/src/core/login/providers/helper.ts +++ b/src/core/login/providers/helper.ts @@ -34,6 +34,7 @@ import { CoreConstants } from '@core/constants'; import { Md5 } from 'ts-md5/dist/md5'; import { CoreSite } from '@classes/site'; import { CoreUrl } from '@singletons/url'; +import { makeSingleton } from '@singletons/core.singletons'; /** * Data related to a SSO authentication. @@ -1417,3 +1418,5 @@ export class CoreLoginHelperProvider { }); } } + +export class CoreLoginHelper extends makeSingleton(CoreLoginHelperProvider) {}