Skip to content
This repository has been archived by the owner on Jul 27, 2023. It is now read-only.

Upgrade compile and target sdk version to Android API 33 #25

Merged
merged 6 commits into from
May 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 3 additions & 3 deletions android/lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ plugins {
}

android {
compileSdkVersion 31
compileSdkVersion 33

defaultConfig {
minSdkVersion 21
targetSdkVersion 31
minSdkVersion 24
targetSdkVersion 33
}

buildTypes {
Expand Down
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change has been copied from the upstream repository: software-mansion@8d70e87

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion example/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
6 changes: 3 additions & 3 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Binary file removed react-native-gesture-handler-2.3.2-wp-2.tgz
Binary file not shown.
Binary file added react-native-gesture-handler-2.3.2-wp-3.tgz
Binary file not shown.