Skip to content

Commit cbc87cb

Browse files
committed
Merge branch 'develop' into release-0.69.2
2 parents e5ea636 + c51b69d commit cbc87cb

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 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
@@ -66,6 +60,7 @@
6660
<meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/ic_capture_lite" />
6761

6862
<activity
63+
android:exported="true"
6964
android:name="io.numbersprotocol.capturelite.MainActivity"
7065
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
7166
android:label="@string/title_activity_main"

android/variables.gradle

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
ext {
2-
minSdkVersion = 21
3-
compileSdkVersion = 31
4-
targetSdkVersion = 30
5-
androidxActivityVersion = '1.2.0'
6-
androidxAppCompatVersion = '1.2.0'
7-
androidxCoordinatorLayoutVersion = '1.1.0'
8-
androidxCoreVersion = '1.3.2'
9-
androidxFragmentVersion = '1.3.0'
10-
junitVersion = '4.13.1'
11-
androidxJunitVersion = '1.1.2'
12-
androidxEspressoCoreVersion = '3.3.0'
13-
cordovaAndroidVersion = '7.0.0'
2+
minSdkVersion = 22
3+
compileSdkVersion = 32
4+
targetSdkVersion = 32
5+
androidxActivityVersion = '1.4.0'
6+
androidxAppCompatVersion = '1.4.0'
7+
androidxCoordinatorLayoutVersion = '1.2.0'
8+
androidxCoreVersion = '1.8.0'
9+
androidxFragmentVersion = '1.4.1'
10+
coreSplashScreenVersion = '1.0.0-rc01'
11+
androidxWebkitVersion = '1.4.0'
12+
junitVersion = '4.13.2'
13+
androidxJunitVersion = '1.1.3'
14+
androidxEspressoCoreVersion = '3.4.0'
15+
cordovaAndroidVersion = '10.1.1'
1416
}

0 commit comments

Comments
 (0)