Merge pull request #25 from wordpress-mobile/update/android-13

Upgrade compile and target sdk version to Android API 33
wordpress-mobile · May 22, 2023 · 2650817 · 2650817
2 parents 7615a7f + 59a26bb
commit 2650817
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -53,11 +53,11 @@ repositories {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 31
+        minSdkVersion 24
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()

diff --git a/android/lib/build.gradle b/android/lib/build.gradle
@@ -3,11 +3,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 31
+        minSdkVersion 24
+        targetSdkVersion 33
     }
 
     buildTypes {

diff --git a/android/lib/src/main/java/com/swmansion/gesturehandler/PanGestureHandler.kt b/android/lib/src/main/java/com/swmansion/gesturehandler/PanGestureHandler.kt
@@ -54,7 +54,7 @@ class PanGestureHandler(context: Context?) : GestureHandler<PanGestureHandler>()
    * position of all the fingers will remain still while doing a rotation gesture.
    */
   init {
-    val vc = ViewConfiguration.get(context)
+    val vc = ViewConfiguration.get(context!!)
     val touchSlop = vc.scaledTouchSlop
     defaultMinDistSq = (touchSlop * touchSlop).toFloat()
     minDistSq = defaultMinDistSq

diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -15,7 +15,8 @@
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
         android:launchMode="singleTask"
-        android:windowSoftInputMode="adjustResize">
+        android:windowSoftInputMode="adjustResize"
+        android:exported="true">
         <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
@@ -4,9 +4,9 @@ buildscript {
     ext.kotlin_version = '1.5.20'
     ext {
         buildToolsVersion = "30.0.2"
-        minSdkVersion =  21
-        compileSdkVersion = 30
-        targetSdkVersion = 30
+        minSdkVersion =  24
+        compileSdkVersion = 33
+        targetSdkVersion = 33
     }
     repositories {
         google()

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-gesture-handler",
-  "version": "2.3.2-wp-2",
+  "version": "2.3.2-wp-3",
   "description": "Experimental implementation of a new declarative API for gesture handling in react-native",
   "scripts": {
     "prepare": "bob build",

diff --git a/react-native-gesture-handler-2.3.2-wp-2.tgz b/react-native-gesture-handler-2.3.2-wp-2.tgz
diff --git a/react-native-gesture-handler-2.3.2-wp-3.tgz b/react-native-gesture-handler-2.3.2-wp-3.tgz