Skip to content

Commit c8e7e4f

Browse files
committed
Merge branch 'develop' into feat-upgrade-capacitor-from-3-to-4-try-1
2 parents 6a2f7c5 + cbc87cb commit c8e7e4f

File tree

7 files changed

+22
-16
lines changed

7 files changed

+22
-16
lines changed

CHANGELOG.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

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

12+
## [0.69.2] - 2022-11-17
13+
14+
### Changed
15+
16+
1. User can update asset info by clicking the `Edit` option (#2310)
17+
18+
### Fixed
19+
20+
1. Fix Android go back button navigation (#2298)
21+
2. Disable the `Mint & Share` option temporarily (#2311)
22+
1223
## [0.69.1] - 2022-11-08
1324

1425
### Fixed
@@ -1901,7 +1912,8 @@ This is the first release! _Capture Lite_ is a cross-platform app adapted from [
19011912
- Web - see the demo [here](https://github.com/numbersprotocol/capture-lite#demo-app)
19021913
- Android - the APK file `app-debug.apk` is attached to this release
19031914

1904-
[unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.69.1...HEAD
1915+
[unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.69.2...HEAD
1916+
[0.69.2]: https://github.com/numbersprotocol/capture-lite/compare/0.69.1...0.69.2
19051917
[0.69.1]: https://github.com/numbersprotocol/capture-lite/compare/0.69.0...0.69.1
19061918
[0.69.0]: https://github.com/numbersprotocol/capture-lite/compare/0.68.0...0.69.0
19071919
[0.68.0]: https://github.com/numbersprotocol/capture-lite/compare/0.67.1...0.68.0

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
applicationId "io.numbersprotocol.capturelite"
77
minSdkVersion rootProject.ext.minSdkVersion
88
targetSdkVersion rootProject.ext.targetSdkVersion
9-
versionCode 451
10-
versionName "0.69.1"
9+
versionCode 452
10+
versionName "0.69.2"
1111
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1212
}
1313
buildFeatures {

android/app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@
2727
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
2828
<!-- Bluetooth -->
2929
<!-- Request legacy Bluetooth permissions on older devices. -->
30-
<uses-permission
31-
android:name="android.permission.BLUETOOTH"
32-
android:maxSdkVersion="30" />
33-
<uses-permission
34-
android:name="android.permission.BLUETOOTH_ADMIN"
35-
android:maxSdkVersion="30" />
3630
<!-- Needed only if your app looks for Bluetooth devices.
3731
You must add an attribute to this permission, or declare the
3832
ACCESS_FINE_LOCATION permission, depending on the results when you

android/variables.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ ext {
77
androidxCoordinatorLayoutVersion = '1.2.0'
88
androidxCoreVersion = '1.8.0'
99
androidxFragmentVersion = '1.4.1'
10+
coreSplashScreenVersion = '1.0.0-rc01'
11+
androidxWebkitVersion = '1.4.0'
1012
junitVersion = '4.13.2'
1113
androidxJunitVersion = '1.1.3'
1214
androidxEspressoCoreVersion = '3.4.0'
1315
cordovaAndroidVersion = '10.1.1'
14-
coreSplashScreenVersion = '1.0.0-rc01'
15-
androidxWebkitVersion = '1.4.0'
1616
}

ios/App/App.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@
370370
INFOPLIST_FILE = App/Info.plist;
371371
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
372372
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
373-
MARKETING_VERSION = 0.69.1;
373+
MARKETING_VERSION = 0.69.2;
374374
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
375375
PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
376376
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -397,7 +397,7 @@
397397
INFOPLIST_FILE = App/Info.plist;
398398
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
399399
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
400-
MARKETING_VERSION = 0.69.1;
400+
MARKETING_VERSION = 0.69.2;
401401
PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
402402
PRODUCT_NAME = "$(TARGET_NAME)";
403403
PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV4;

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "capture-lite",
3-
"version": "0.69.1",
3+
"version": "0.69.2",
44
"author": "numbersprotocol",
55
"homepage": "https://numbersprotocol.io/",
66
"scripts": {

0 commit comments

Comments
 (0)