railbird/react-native-vision-camera
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: Upgrade CameraX to alpha09 (#472)

Browse Source 
* chore: Upgrade CameraX to alpha09

* Remove custom ProGuard file

It's no longer needed, CameraX now ships one.

* Set `targetSdkVersion` to `31`

* set `compileSdkVersion` to 31

* Add `android:exported=false`
This commit is contained in:
Marc Rousavy 2021-10-07 12:20:21 +02:00 committed by GitHub
parent bd46da614e
commit 8d24e344c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
android/build.gradle
View File

@ -88,7 +88,6 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion getExtOrIntegerDefault('targetSdkVersion') targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
consumerProguardFiles 'proguard-rules.pro'
externalNativeBuild { externalNativeBuild {
cmake { cmake {
@ -234,11 +233,11 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.5.2" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.5.2"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
implementation "androidx.camera:camera-core:1.1.0-alpha08" implementation "androidx.camera:camera-core:1.1.0-alpha09"
implementation "androidx.camera:camera-camera2:1.1.0-alpha08" implementation "androidx.camera:camera-camera2:1.1.0-alpha09"
implementation "androidx.camera:camera-lifecycle:1.1.0-alpha08" implementation "androidx.camera:camera-lifecycle:1.1.0-alpha09"
implementation "androidx.camera:camera-extensions:1.0.0-alpha28" implementation "androidx.camera:camera-extensions:1.0.0-alpha29"
implementation "androidx.camera:camera-view:1.0.0-alpha28" implementation "androidx.camera:camera-view:1.0.0-alpha29"
implementation "androidx.exifinterface:exifinterface:1.3.3" implementation "androidx.exifinterface:exifinterface:1.3.3"
} }

4
android/gradle.properties
View File

@ -12,9 +12,9 @@
# org.gradle.parallel=true # org.gradle.parallel=true
#Fri Feb 19 20:46:14 CET 2021 #Fri Feb 19 20:46:14 CET 2021
VisionCamera_buildToolsVersion=30.0.0 VisionCamera_buildToolsVersion=30.0.0
VisionCamera_compileSdkVersion=30 VisionCamera_compileSdkVersion=31
VisionCamera_kotlinVersion=1.5.30 VisionCamera_kotlinVersion=1.5.30
VisionCamera_targetSdkVersion=30 VisionCamera_targetSdkVersion=31
VisionCamera_ndkVersion=21.4.7075529 VisionCamera_ndkVersion=21.4.7075529
android.enableJetifier=true android.enableJetifier=true
android.useAndroidX=true android.useAndroidX=true

2
android/proguard-rules.pro vendored
View File

@ -1,2 +0,0 @@
# VisionCamera (CameraX)
-keep class androidx.camera.extensions.** { *; }

4
example/android/app/src/debug/AndroidManifest.xml
View File

@ -5,6 +5,8 @@
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/> <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning"> <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning">
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" /> <activity
android:name="com.facebook.react.devsupport.DevSettingsActivity"
android:exported="false" />
</application> </application>
</manifest> </manifest>

3
example/android/app/src/main/AndroidManifest.xml
View File

@ -32,7 +32,8 @@
android:launchMode="singleTask" android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize" android:windowSoftInputMode="adjustResize"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:fitsSystemWindows="false"> android:fitsSystemWindows="false"
android:exported="false">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />

4
example/android/build.gradle
View File

@ -5,8 +5,8 @@ buildscript {
RNNKotlinVersion = "1.3.61" RNNKotlinVersion = "1.3.61"
buildToolsVersion = "30.0.2" buildToolsVersion = "30.0.2"
minSdkVersion = 21 minSdkVersion = 21
compileSdkVersion = 30 compileSdkVersion = 31
targetSdkVersion = 30 targetSdkVersion = 31
ndkVersion = "21.4.7075529" ndkVersion = "21.4.7075529"
} }
repositories { repositories {