Skip to content

Commit

Permalink
Merge branch 'develop' into release-0.69.2
Browse files Browse the repository at this point in the history
  • Loading branch information
bafu committed Nov 18, 2022
2 parents e5ea636 + c51b69d commit cbc87cb
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 18 deletions.
7 changes: 1 addition & 6 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,6 @@
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<!-- Bluetooth -->
<!-- Request legacy Bluetooth permissions on older devices. -->
<uses-permission
android:name="android.permission.BLUETOOTH"
android:maxSdkVersion="30" />
<uses-permission
android:name="android.permission.BLUETOOTH_ADMIN"
android:maxSdkVersion="30" />
<!-- Needed only if your app looks for Bluetooth devices.
You must add an attribute to this permission, or declare the
ACCESS_FINE_LOCATION permission, depending on the results when you
Expand Down Expand Up @@ -66,6 +60,7 @@
<meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/ic_capture_lite" />

<activity
android:exported="true"
android:name="io.numbersprotocol.capturelite.MainActivity"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
android:label="@string/title_activity_main"
Expand Down
26 changes: 14 additions & 12 deletions android/variables.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
ext {
minSdkVersion = 21
compileSdkVersion = 31
targetSdkVersion = 30
androidxActivityVersion = '1.2.0'
androidxAppCompatVersion = '1.2.0'
androidxCoordinatorLayoutVersion = '1.1.0'
androidxCoreVersion = '1.3.2'
androidxFragmentVersion = '1.3.0'
junitVersion = '4.13.1'
androidxJunitVersion = '1.1.2'
androidxEspressoCoreVersion = '3.3.0'
cordovaAndroidVersion = '7.0.0'
minSdkVersion = 22
compileSdkVersion = 32
targetSdkVersion = 32
androidxActivityVersion = '1.4.0'
androidxAppCompatVersion = '1.4.0'
androidxCoordinatorLayoutVersion = '1.2.0'
androidxCoreVersion = '1.8.0'
androidxFragmentVersion = '1.4.1'
coreSplashScreenVersion = '1.0.0-rc01'
androidxWebkitVersion = '1.4.0'
junitVersion = '4.13.2'
androidxJunitVersion = '1.1.3'
androidxEspressoCoreVersion = '3.4.0'
cordovaAndroidVersion = '10.1.1'
}

0 comments on commit cbc87cb

Please sign in to comment.