Merge branch 'release-0.65.0'

numbersprotocol · Sep 6, 2022 · 0866c43 · 0866c43
2 parents b0325a0 + b1a827b
commit 0866c43
Show file tree

Hide file tree

Showing 33 changed files with 19,982 additions and 24,582 deletions.
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -137,20 +137,16 @@ jobs:
           name: ios-build-number
           path: build/ios-build-number.txt
 
-  create-github-release:
+  upload-android-debug-apks:
     runs-on: ubuntu-latest
-    needs: [deploy-play-store, deploy-app-store]
+    needs: deploy-play-store
     steps:
       - uses: actions/checkout@v2
 
       - uses: actions/setup-node@v2
         with:
           node-version: '16.15.0'
 
-      - name: Get release version
-        id: version_check
-        run: echo ::set-output name=version::${GITHUB_REF/refs\/tags\//}
-
       - name: Build Ionic
         env:
           NUMBERS_STORAGE_BASE_URL: ${{ secrets.NUMBERS_STORAGE_BASE_URL }}
@@ -170,36 +166,18 @@ jobs:
           cd android/
           ./gradlew assembleDebug
 
-      - name: Create GitHub prerelease
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload debug APK and metadata to release assets
+        uses: softprops/action-gh-release@v1
         with:
-          tag_name: ${{ steps.version_check.outputs.version }}
-          release_name: ${{ steps.version_check.outputs.version }}
-          body: Thanks for following along! For more information check out the [CHANGELOG](https://github.com/numbersprotocol/capture-lite/blob/master/CHANGELOG.md).
-          prerelease: true
-
-      - name: Upload debug APK to release assets
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./android/app/build/outputs/apk/debug/app-debug.apk
-          asset_name: app-debug.apk
-          asset_content_type: application/vnd.android.package-archive
+          files: |
+            ./android/app/build/outputs/apk/debug/app-debug.apk
+            ./android/app/build/outputs/apk/debug/output-metadata.json
 
-      - name: Upload debug metadata.json to release assets
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./android/app/build/outputs/apk/debug/output-metadata.json
-          asset_name: output-metadata-debug.json
-          asset_content_type: application/json
+  get-ios-build-number:
+    runs-on: ubuntu-latest
+    needs: deploy-app-store
+    steps:
+      - uses: actions/checkout@v2
 
       - name: Download iOS build number
         uses: actions/download-artifact@v2
@@ -211,6 +189,24 @@ jobs:
           IOS_BUILD=`cat ios-build-number.txt`
           echo "ios_build_number=$IOS_BUILD" >> $GITHUB_ENV
 
+  create-github-release:
+    runs-on: ubuntu-latest
+    needs: [upload-android-debug-apks, get-ios-build-number]
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Get release version
+        id: version_check
+        run: echo ::set-output name=version::${GITHUB_REF/refs\/tags\//}
+
+      - name: Create GitHub prerelease
+        id: create_release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          body: Thanks for following along! For more information check out the [CHANGELOG](https://github.com/numbersprotocol/capture-lite/blob/master/CHANGELOG.md).
+          prerelease: true
+
       - name: Send Slack notification
         uses: rtCamp/action-slack-notify@master
         env:

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/.angular/cache
 # Specifies intentionally untracked files to ignore when using Git
 # http://git-scm.com/docs/gitignore
 

diff --git a/.prettierignore b/.prettierignore
@@ -14,6 +14,7 @@ $RECYCLE.BIN/
 log.txt
 npm-debug.log*
 
+/.angular
 /.idea
 /.ionic
 /.sass-cache

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.65.0] - 2022-09-06
+
+[Milestone Sprint 22.08.29](https://github.com/numbersprotocol/capture-lite/milestone/54)
+
+### Added
+
+1. Replace Authmedia by NSE (#2000)
+2. Support tapping to focus in camera (#2001)
+
+### Changed
+
+1. Make iframe URL configurable (#1979)
+2. Update asset_page URL params (#1989)
+3. Update grid layout in profile tab (#2022)
+4. Preserve tab state (#2027, #2034)
+5. Use new JWT in iframe (#2037)
+
+### Fixed
+
+1. Centerize user email on profile (#1969)
+
 ## [0.64.4] - 2022-08-29
 
 ### Fixed
@@ -1789,19 +1810,25 @@ This is the first release! _Capture Lite_ is a cross-platform app adapted from [
 - Web - see the demo [here](https://github.com/numbersprotocol/capture-lite#demo-app)
 - Android - the APK file `app-debug.apk` is attached to this release
 
+<<<<<<< HEAD
+[unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.65.0...HEAD
+[0.65.0]: https://github.com/numbersprotocol/capture-lite/compare/0.64.3...0.65.0
+=======
 [unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.64.4...HEAD
 [0.64.4]: https://github.com/numbersprotocol/capture-lite/compare/0.64.3...0.64.4
-[0.64.3]: https://github.com/numbersprotocol/capture-lite/compare/0.64.2...0.64.3
-[0.64.2]: https://github.com/numbersprotocol/capture-lite/compare/0.64.1...0.64.2
-[0.64.1]: https://github.com/numbersprotocol/capture-lite/compare/0.64.0...0.64.1
-[0.64.0]: https://github.com/numbersprotocol/capture-lite/compare/0.63.2...0.64.0
-[0.63.2]: https://github.com/numbersprotocol/capture-lite/compare/0.63.1...0.63.2
-[0.63.1]: https://github.com/numbersprotocol/capture-lite/compare/0.63.0...0.63.1
-[0.63.0]: https://github.com/numbersprotocol/capture-lite/compare/0.62.0...0.63.0
-[0.62.0]: https://github.com/numbersprotocol/capture-lite/compare/0.61.2...0.62.0
-[0.61.2]: https://github.com/numbersprotocol/capture-lite/compare/0.61.1...0.61.2
-[0.61.1]: https://github.com/numbersprotocol/capture-lite/compare/0.61.0...0.61.1
-[0.61.0]: https://github.com/numbersprotocol/capture-lite/compare/0.60.4...0.61.0
-[0.60.4]: https://github.com/numbersprotocol/capture-lite/compare/0.60.3...0.60.4
-[0.60.3]: https://github.com/numbersprotocol/capture-lite/compare/0.60.2...0.60.3
-[0.60.2]: https://github.com/numbersprotocol/capture-lite/releases/tag/0.60.2
+
+> > > > > > > develop
+> > > > > > > [0.64.3]: https://github.com/numbersprotocol/capture-lite/compare/0.64.2...0.64.3
+> > > > > > > [0.64.2]: https://github.com/numbersprotocol/capture-lite/compare/0.64.1...0.64.2
+> > > > > > > [0.64.1]: https://github.com/numbersprotocol/capture-lite/compare/0.64.0...0.64.1
+> > > > > > > [0.64.0]: https://github.com/numbersprotocol/capture-lite/compare/0.63.2...0.64.0
+> > > > > > > [0.63.2]: https://github.com/numbersprotocol/capture-lite/compare/0.63.1...0.63.2
+> > > > > > > [0.63.1]: https://github.com/numbersprotocol/capture-lite/compare/0.63.0...0.63.1
+> > > > > > > [0.63.0]: https://github.com/numbersprotocol/capture-lite/compare/0.62.0...0.63.0
+> > > > > > > [0.62.0]: https://github.com/numbersprotocol/capture-lite/compare/0.61.2...0.62.0
+> > > > > > > [0.61.2]: https://github.com/numbersprotocol/capture-lite/compare/0.61.1...0.61.2
+> > > > > > > [0.61.1]: https://github.com/numbersprotocol/capture-lite/compare/0.61.0...0.61.1
+> > > > > > > [0.61.0]: https://github.com/numbersprotocol/capture-lite/compare/0.60.4...0.61.0
+> > > > > > > [0.60.4]: https://github.com/numbersprotocol/capture-lite/compare/0.60.3...0.60.4
+> > > > > > > [0.60.3]: https://github.com/numbersprotocol/capture-lite/compare/0.60.2...0.60.3
+> > > > > > > [0.60.2]: https://github.com/numbersprotocol/capture-lite/releases/tag/0.60.2
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -7,7 +7,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 441
-        versionName "0.64.4"
+        versionName "0.65.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildFeatures {

diff --git a/angular.json b/angular.json
@@ -1,7 +1,6 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
-  "defaultProject": "app",
   "newProjectRoot": "projects",
   "projects": {
     "app": {
@@ -89,9 +88,7 @@
             "production": {
               "browserTarget": "app:build:production"
             },
-            "ci": {
-              "progress": false
-            },
+            "ci": {},
             "development": {
               "browserTarget": "app:build:development"
             }
@@ -190,8 +187,8 @@
     }
   },
   "cli": {
-    "defaultCollection": "@ionic/angular-toolkit",
-    "analytics": false
+    "analytics": false,
+    "schematicCollections": ["@ionic/angular-toolkit"]
   },
   "schematics": {
     "@ionic/angular-toolkit:component": {

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -369,7 +369,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.64.4;
+				MARKETING_VERSION = 0.65.0;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -394,7 +394,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.64.4;
+				MARKETING_VERSION = 0.65.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV2;