Skip to content

Commit

Permalink
Merge branch 'release-0.68.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
bafu committed Oct 25, 2022
2 parents 06ba1e8 + d22fecd commit 7d212dc
Show file tree
Hide file tree
Showing 20 changed files with 849 additions and 41 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-apks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ jobs:
NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets[matrix.storage_trusted_client_key] }}
NUMBERS_BUBBLE_DB_URL: ${{ secrets[matrix.bubble_db_url] }}
BUBBLE_API_URL: ${{ secrets.BUBBLE_API_URL }}
NUMBERS_PQINA_NPM_KEY: ${{ secrets.NUMBERS_PQINA_NPM_KEY }}
run: |
npm install -g @ionic/cli
npm install
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ jobs:
- name: Install Ionic CLI
run: npm install -g @ionic/cli

- name: Generate .npmrc for pintura package
env:
NUMBERS_PQINA_NPM_KEY: ${{ secrets.NUMBERS_PQINA_NPM_KEY }}
run: npm run preconfig.npmrc

- name: Install dependencies
run: npm install

Expand All @@ -31,6 +36,7 @@ jobs:
NUMBERS_BUBBLE_IFRAME_URL: ${{ secrets.NUMBERS_BUBBLE_IFRAME_URL }}
BUBBLE_API_URL: ${{ secrets.BUBBLE_API_URL }}
APPS_FLYER_DEV_KEY: ${{ secrets.APPS_FLYER_DEV_KEY }}
NUMBERS_PQINA_NPM_KEY: ${{ secrets.NUMBERS_PQINA_NPM_KEY }}
run: npm run build

- name: Build Android
Expand All @@ -55,6 +61,11 @@ jobs:
- name: Install Ionic CLI
run: npm install -g @ionic/cli

- name: Generate .npmrc for pintura package
env:
NUMBERS_PQINA_NPM_KEY: ${{ secrets.NUMBERS_PQINA_NPM_KEY }}
run: npm run preconfig.npmrc

- name: Install dependencies
run: npm install

Expand All @@ -66,6 +77,7 @@ jobs:
NUMBERS_BUBBLE_IFRAME_URL: ${{ secrets.NUMBERS_BUBBLE_IFRAME_URL }}
BUBBLE_API_URL: ${{ secrets.BUBBLE_API_URL }}
APPS_FLYER_DEV_KEY: ${{ secrets.APPS_FLYER_DEV_KEY }}
NUMBERS_PQINA_NPM_KEY: ${{ secrets.NUMBERS_PQINA_NPM_KEY }}
run: npm run build

- name: Import the Code-Signing PKCS12 Certificate
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
NUMBERS_BUBBLE_IFRAME_URL: ${{ secrets.NUMBERS_BUBBLE_IFRAME_URL_QA_RELEASE }}
BUBBLE_API_URL: ${{ secrets.BUBBLE_API_URL }}
APPS_FLYER_DEV_KEY: ${{ secrets.APPS_FLYER_DEV_KEY }}
NUMBERS_PQINA_NPM_KEY: ${{ secrets.NUMBERS_PQINA_NPM_KEY }}
run: |
npm install -g @ionic/cli
npm install
Expand Down Expand Up @@ -98,6 +99,7 @@ jobs:
NUMBERS_BUBBLE_IFRAME_URL: ${{ secrets.NUMBERS_BUBBLE_IFRAME_URL }}
BUBBLE_API_URL: ${{ secrets.BUBBLE_API_URL }}
APPS_FLYER_DEV_KEY: ${{ secrets.APPS_FLYER_DEV_KEY }}
NUMBERS_PQINA_NPM_KEY: ${{ secrets.NUMBERS_PQINA_NPM_KEY }}
run: |
npm install -g @ionic/cli
npm install
Expand Down Expand Up @@ -172,6 +174,7 @@ jobs:
NUMBERS_BUBBLE_IFRAME_URL: ${{ secrets.NUMBERS_BUBBLE_IFRAME_URL }}
BUBBLE_API_URL: ${{ secrets.BUBBLE_API_URL }}
APPS_FLYER_DEV_KEY: ${{ secrets.APPS_FLYER_DEV_KEY }}
NUMBERS_PQINA_NPM_KEY: ${{ secrets.NUMBERS_PQINA_NPM_KEY }}
run: |
npm install -g @ionic/cli
npm install
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ npm-debug.log*
/www
.gradle/
secret.ts
.npmrc

resources/android/icon
resources/android/splash
Expand Down
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

To check the difference between the last releaes and the latest dev status, click the link above.

## [0.68.0] - 2022-10-25

### Changed

1. Support photo editor (#2208)

### Fixed

1. Remove duplicate network status (#2203)
1. Fix camera crash on iOS when recording video (#2209)
1. Rename Itegrity Key to Integrity Wallet (#2210)

## [0.67.1] - 2022-10-21

### Fixed
Expand Down Expand Up @@ -1865,7 +1877,8 @@ 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

[unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.67.1...HEAD
[unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.68.0...HEAD
[0.68.0]: https://github.com/numbersprotocol/capture-lite/compare/0.67.1...0.68.0
[0.67.1]: https://github.com/numbersprotocol/capture-lite/compare/0.67.0...0.67.1
[0.67.0]: https://github.com/numbersprotocol/capture-lite/compare/0.66.3...0.67.0
[0.66.3]: https://github.com/numbersprotocol/capture-lite/compare/0.66.2...0.66.3
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ android {
applicationId "io.numbersprotocol.capturelite"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 448
versionName "0.67.1"
versionCode 449
versionName "0.68.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildFeatures {
Expand Down
3 changes: 3 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
},
{
"input": "node_modules/material-design-icons-iconfont/dist/material-design-icons.css"
},
{
"input": "node_modules/@pqina/pintura/pintura.css"
}
],
"scripts": [],
Expand Down
12 changes: 8 additions & 4 deletions ios/App/App.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -366,14 +366,16 @@
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = G7NB5YCKAP;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.7;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 0.67.1;
MARKETING_VERSION = 0.68.0;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV2;
PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV3;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = NumbersAppDistributionV3;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG USE_PUSH";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -391,13 +393,15 @@
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = G7NB5YCKAP;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.7;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 0.67.1;
MARKETING_VERSION = 0.68.0;
PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV2;
PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV3;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = NumbersAppDistributionV3;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = USE_PUSH;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down

0 comments on commit 7d212dc

Please sign in to comment.