Merge pull request #117 from supportingami/release/2.7.0

Release/2.7.0
supportingami · May 9, 2021 · b033d79 · b033d79
2 parents 869e845 + 6a9fe90
commit b033d79
Show file tree

Hide file tree

Showing 6 changed files with 2,645 additions and 3,284 deletions.
diff --git a/maths-club-app/android/app/build.gradle b/maths-club-app/android/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "io.c2dev.samimathsclub"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 2006004
-        versionName "2.6.4"
+        versionCode 2007000
+        versionName "2.7.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/maths-club-app/ios/App/App/Info.plist b/maths-club-app/ios/App/App/Info.plist
@@ -17,7 +17,7 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.6.4</string>
+    <string>2.7.0</string>
     <key>CFBundleURLTypes</key>
     <array>
       <dict>

diff --git a/maths-club-app/ios/App/Podfile b/maths-club-app/ios/App/Podfile
@@ -10,7 +10,7 @@ def capacitor_pods
   # Automatic Capacitor Pod dependencies, do not delete
   pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
-  pod 'CapacitorCommunityFirebaseAnalytics', :path => '../../node_modules/@capacitor-community/firebase-analytics'
+  pod 'CapacitorCommunityFirebaseAnalytics', :path => '..\..\node_modules\@capacitor-community\firebase-analytics'
   # Do not delete
 end
 

diff --git a/maths-club-app/package.json b/maths-club-app/package.json
@@ -13,52 +13,52 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~11.0.5",
-    "@angular/cdk": "^11.0.3",
-    "@angular/common": "~11.0.5",
-    "@angular/compiler": "~11.0.5",
-    "@angular/core": "~11.0.5",
-    "@angular/forms": "~11.0.5",
-    "@angular/material": "^11.0.3",
-    "@angular/platform-browser": "~11.0.5",
-    "@angular/platform-browser-dynamic": "~11.0.5",
-    "@angular/router": "~11.0.5",
-    "@capacitor-community/firebase-analytics": "^0.2.0",
-    "@capacitor/android": "2.4.5",
-    "@capacitor/cli": "^2.4.5",
-    "@capacitor/core": "^2.4.5",
-    "@capacitor/ios": "2.4.5",
-    "@sentry/angular": "^5.29.2",
-    "@sentry/tracing": "^5.29.2",
+    "@angular/animations": "~11.2.13",
+    "@angular/cdk": "^11.2.12",
+    "@angular/common": "~11.2.13",
+    "@angular/compiler": "~11.2.13",
+    "@angular/core": "~11.2.13",
+    "@angular/forms": "~11.2.13",
+    "@angular/material": "^11.2.12",
+    "@angular/platform-browser": "~11.2.13",
+    "@angular/platform-browser-dynamic": "~11.2.13",
+    "@angular/router": "~11.2.13",
+    "@capacitor-community/firebase-analytics": "^0.2.2",
+    "@capacitor/android": "2.4.7",
+    "@capacitor/cli": "^2.4.7",
+    "@capacitor/core": "^2.4.7",
+    "@capacitor/ios": "2.4.7",
+    "@sentry/angular": "^6.3.5",
+    "@sentry/tracing": "^6.3.5",
     "material-design-icons": "^3.0.1",
-    "ngx-markdown": "^11.0.1",
-    "rxjs": "~6.6.3",
-    "tslib": "^2.0.3",
-    "zone.js": "~0.11.3"
+    "ngx-markdown": "^11.1.3",
+    "rxjs": "~7.0.0",
+    "tslib": "^2.2.0",
+    "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1100.5",
-    "@angular/cli": "~11.0.5",
-    "@angular/compiler-cli": "~11.0.5",
-    "@angular/language-service": "~11.0.5",
-    "@types/jasmine": "~3.6.0",
-    "@types/jasminewd2": "~2.0.3",
-    "@types/node": "^14.14.16",
-    "codelyzer": "^6.0.1",
-    "eslint": "^7.16.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-prettier": "^3.3.0",
-    "jasmine-core": "~3.6.0",
-    "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.2.3",
+    "@angular-devkit/build-angular": "~0.1102.12",
+    "@angular/cli": "~11.2.12",
+    "@angular/compiler-cli": "~11.2.13",
+    "@angular/language-service": "~11.2.13",
+    "@types/jasmine": "~3.7.1",
+    "@types/jasminewd2": "~2.0.9",
+    "@types/node": "^15.0.2",
+    "codelyzer": "^6.0.2",
+    "eslint": "^7.26.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^3.4.0",
+    "jasmine-core": "~3.7.1",
+    "jasmine-spec-reporter": "~7.0.0",
+    "karma": "~6.3.2",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.3",
     "karma-jasmine": "~4.0.1",
-    "karma-jasmine-html-reporter": "^1.5.4",
+    "karma-jasmine-html-reporter": "^1.6.0",
     "prettier": "^2.2.1",
-    "prettier-eslint": "^11.0.0",
+    "prettier-eslint": "^12.0.0",
     "protractor": "~7.0.0",
     "ts-node": "~9.1.1",
-    "typescript": "~4.0.2"
+    "typescript": "~4.1.5"
   }
 }