From 8d24e344c9252a6a500e5f63a39539e0ff24fa11 Mon Sep 17 00:00:00 2001
From: Marc Rousavy <marcrousavy@hotmail.com>
Date: Thu, 7 Oct 2021 12:20:21 +0200
Subject: [PATCH] chore: Upgrade CameraX to alpha09 (#472)

* 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`
---
 android/build.gradle                              | 11 +++++------
 android/gradle.properties                         |  4 ++--
 android/proguard-rules.pro                        |  2 --
 example/android/app/src/debug/AndroidManifest.xml |  4 +++-
 example/android/app/src/main/AndroidManifest.xml  |  3 ++-
 example/android/build.gradle                      |  4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 android/proguard-rules.pro

diff --git a/android/build.gradle b/android/build.gradle
index 17a55b9..f3ffea4 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -88,7 +88,6 @@ android {
   defaultConfig {
     minSdkVersion 21
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
-    consumerProguardFiles 'proguard-rules.pro'
 
     externalNativeBuild {
       cmake {
@@ -234,11 +233,11 @@ dependencies {
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-guava: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-camera2:1.1.0-alpha08"
-  implementation "androidx.camera:camera-lifecycle:1.1.0-alpha08"
-  implementation "androidx.camera:camera-extensions:1.0.0-alpha28"
-  implementation "androidx.camera:camera-view:1.0.0-alpha28"
+  implementation "androidx.camera:camera-core:1.1.0-alpha09"
+  implementation "androidx.camera:camera-camera2:1.1.0-alpha09"
+  implementation "androidx.camera:camera-lifecycle:1.1.0-alpha09"
+  implementation "androidx.camera:camera-extensions:1.0.0-alpha29"
+  implementation "androidx.camera:camera-view:1.0.0-alpha29"
   implementation "androidx.exifinterface:exifinterface:1.3.3"
 }
 
diff --git a/android/gradle.properties b/android/gradle.properties
index 676eb00..d171611 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -12,9 +12,9 @@
 # org.gradle.parallel=true
 #Fri Feb 19 20:46:14 CET 2021
 VisionCamera_buildToolsVersion=30.0.0
-VisionCamera_compileSdkVersion=30
+VisionCamera_compileSdkVersion=31
 VisionCamera_kotlinVersion=1.5.30
-VisionCamera_targetSdkVersion=30
+VisionCamera_targetSdkVersion=31
 VisionCamera_ndkVersion=21.4.7075529
 android.enableJetifier=true
 android.useAndroidX=true
diff --git a/android/proguard-rules.pro b/android/proguard-rules.pro
deleted file mode 100644
index c8c9ed4..0000000
--- a/android/proguard-rules.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-# VisionCamera (CameraX)
--keep class androidx.camera.extensions.** { *; }
diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml
index 0c4927b..348fd62 100644
--- a/example/android/app/src/debug/AndroidManifest.xml
+++ b/example/android/app/src/debug/AndroidManifest.xml
@@ -5,6 +5,8 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
     <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>
 </manifest>
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 2f0417f..b02f2b1 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -32,7 +32,8 @@
         android:launchMode="singleTask"
         android:windowSoftInputMode="adjustResize"
         android:screenOrientation="portrait"
-        android:fitsSystemWindows="false">
+        android:fitsSystemWindows="false"
+        android:exported="false">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
diff --git a/example/android/build.gradle b/example/android/build.gradle
index deeb67d..afe48d6 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -5,8 +5,8 @@ buildscript {
         RNNKotlinVersion = "1.3.61"
         buildToolsVersion = "30.0.2"
         minSdkVersion = 21
-        compileSdkVersion = 30
-        targetSdkVersion = 30
+        compileSdkVersion = 31
+        targetSdkVersion = 31
         ndkVersion = "21.4.7075529"
     }
     repositories {