New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[ios][android] Update react-native-gesture-handler to 2.7.0 #19362
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 0 additions & 30 deletions
30
...sioned/host/exp/exponent/modules/api/components/gesturehandler/RNGestureHandlerPackage.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
229 changes: 229 additions & 0 deletions
229
android/vendored/unversioned/react-native-gesture-handler/android/build.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,229 @@ | ||
| import groovy.json.JsonSlurper | ||
| import java.nio.file.Paths | ||
|
|
||
| buildscript { | ||
| def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['RNGH_kotlinVersion'] | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| } | ||
|
|
||
| dependencies { | ||
| classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") | ||
| } | ||
| } | ||
|
|
||
| def isNewArchitectureEnabled() { | ||
| // To opt-in for the New Architecture, you can either: | ||
| // - Set `newArchEnabled` to true inside the `gradle.properties` file | ||
| // - Invoke gradle with `-newArchEnabled=true` | ||
| // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true` | ||
| return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true" | ||
| } | ||
|
|
||
| static def findNodeModulePath(baseDir, packageName) { | ||
| def basePath = baseDir.toPath().normalize() | ||
| // Node's module resolution algorithm searches up to the root directory, | ||
| // after which the base path will be null | ||
| while (basePath) { | ||
| def candidatePath = Paths.get(basePath.toString(), "node_modules", packageName) | ||
| if (candidatePath.toFile().exists()) { | ||
| return candidatePath.toString() | ||
| } | ||
| basePath = basePath.getParent() | ||
| } | ||
| return null | ||
| } | ||
|
|
||
| def findNodeModulePath(packageName) { | ||
| // Don't start in the project dir, as its path ends with node_modules/react-native-gesture-handler/android | ||
| // we want to go two levels up, so we end up in the first_node modules and eventually | ||
| // search upwards if the package is not found there | ||
| return findNodeModulePath(projectDir.toPath().parent.parent.toFile(), packageName) | ||
| } | ||
|
|
||
| if (isNewArchitectureEnabled()) { | ||
| apply plugin: 'com.facebook.react' | ||
| } | ||
| apply plugin: 'com.android.library' | ||
| apply plugin: 'kotlin-android' | ||
|
|
||
| def safeExtGet(prop, fallback) { | ||
| rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback | ||
| } | ||
|
|
||
| // Check whether Reanimated 2.3 or higher is installed alongside Gesture Handler | ||
| def shouldUseCommonInterfaceFromReanimated() { | ||
| def reanimated = rootProject.subprojects.find { it.name == 'react-native-reanimated' } | ||
| if (reanimated != null) { | ||
| def inputFile = new File(reanimated.projectDir, '../package.json') | ||
| def json = new JsonSlurper().parseText(inputFile.text) | ||
| def reanimatedVersion = json.version as String | ||
| def (major, minor, patch) = reanimatedVersion.tokenize('.') | ||
| return (Integer.parseInt(major) == 2 && Integer.parseInt(minor) >= 3) || Integer.parseInt(major) == 3 | ||
| } else { | ||
| return false | ||
| } | ||
| } | ||
|
|
||
| def reactNativeArchitectures() { | ||
| def value = project.getProperties().get("reactNativeArchitectures") | ||
| return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] | ||
| } | ||
|
|
||
| def shouldAssertNoMultipleInstances() { | ||
| if (rootProject.hasProperty("disableMultipleInstancesCheck")) { | ||
| return rootProject.property("disableMultipleInstancesCheck") != "true" | ||
| } else { | ||
| return true | ||
| } | ||
| } | ||
|
|
||
| def noMultipleInstancesAssertion() { | ||
| Set<File> files = fileTree(rootDir.parent) { | ||
| include "node_modules/**/react-native-gesture-handler/package.json" | ||
| exclude "**/.yarn/**" | ||
| }.files | ||
|
|
||
| if (files.size() > 1) { | ||
| String parsedLocation = files.stream().map({ File file -> "- " + file.toString().replace("/package.json", "") }).collect().join("\n") | ||
| String exceptionMessage = "\n[Gesture Handler] Multiple instances of Gesture Handler were detected. Only one instance of react-native-gesture-handler can be installed in a project. You need to resolve the conflict manually. Check out the documentation: https://docs.swmansion.com/react-native-gesture-handler/docs/troubleshooting#multiple-instances-of-gesture-handler-were-detected \n\nConflict between: \n" + parsedLocation + "\n"; | ||
| throw new Exception(exceptionMessage); | ||
| } | ||
| } | ||
|
|
||
| def REACT_NATIVE_DIR = findNodeModulePath("react-native") | ||
|
|
||
| def assertionTask = task assertNoMultipleInstances { | ||
| onlyIf { shouldAssertNoMultipleInstances() } | ||
| doFirst { | ||
| noMultipleInstancesAssertion() | ||
| } | ||
| } | ||
|
|
||
| tasks.preBuild { | ||
| dependsOn assertionTask | ||
| } | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| } | ||
|
|
||
| android { | ||
| compileSdkVersion safeExtGet("compileSdkVersion", 28) | ||
|
|
||
| // Used to override the NDK path/version on internal CI or by allowing | ||
| // users to customize the NDK path/version from their root project (e.g. for M1 support) | ||
| if (rootProject.hasProperty("ndkPath")) { | ||
| ndkPath rootProject.ext.ndkPath | ||
| } | ||
| if (rootProject.hasProperty("ndkVersion")) { | ||
| ndkVersion rootProject.ext.ndkVersion | ||
| } | ||
|
|
||
| defaultConfig { | ||
| minSdkVersion safeExtGet('minSdkVersion', 16) | ||
| targetSdkVersion safeExtGet('targetSdkVersion', 28) | ||
| versionCode 1 | ||
| versionName "1.0" | ||
| buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() | ||
| if (isNewArchitectureEnabled()) { | ||
| var appProject = rootProject.allprojects.find {it.plugins.hasPlugin('com.android.application')} | ||
| externalNativeBuild { | ||
| cmake { | ||
| cppFlags "-O2 -frtti -fexceptions -Wall -Wno-unused-variable -fstack-protector-all" | ||
| arguments "-DAPP_BUILD_DIR=${appProject.buildDir}", | ||
| "-DREACT_NATIVE_DIR=${REACT_NATIVE_DIR}", | ||
| "-DANDROID_STL=c++_shared" | ||
| abiFilters (*reactNativeArchitectures()) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_1_8 | ||
| targetCompatibility JavaVersion.VERSION_1_8 | ||
| } | ||
|
|
||
| if (isNewArchitectureEnabled()) { | ||
| externalNativeBuild { | ||
| cmake { | ||
| path "src/main/jni/CMakeLists.txt" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| packagingOptions { | ||
| // For some reason gradle only complains about the duplicated version of libreact_render libraries | ||
| // while there are more libraries copied in intermediates folder of the lib build directory, we exclude | ||
| // only the ones that make the build fail (ideally we should only include libgesturehandler but we | ||
| // are only allowed to specify exclude patterns) | ||
| exclude "**/libreact_render*.so" | ||
| } | ||
|
|
||
| // Include "lib/" as sources, unfortunately react-native link can't handle | ||
| // setting up alternative gradle modules. We still have "lib" defined as a | ||
| // standalone gradle module just to be used in AndroidNativeExample | ||
| sourceSets.main { | ||
| java { | ||
| srcDirs += 'lib/src/main/java' | ||
|
|
||
| // Include "common/" only when it's not provided by Reanimated to mitigate | ||
| // multiple definitions of the same class preventing build | ||
| if (shouldUseCommonInterfaceFromReanimated()) { | ||
| srcDirs += 'reanimated/src/main/java' | ||
| } else { | ||
| srcDirs += 'common/src/main/java' | ||
| srcDirs += 'noreanimated/src/main/java' | ||
| } | ||
|
|
||
| if (isNewArchitectureEnabled()) { | ||
| srcDirs += 'src/fabric/java' | ||
| } else { | ||
| // this folder also includes files from codegen so the library can compile with | ||
| // codegen turned off | ||
| srcDirs += 'src/paper/java' | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| def kotlin_version = safeExtGet('kotlinVersion', project.properties['RNGH_kotlinVersion']) | ||
|
|
||
| dependencies { | ||
| //noinspection GradleDynamicVersion | ||
| if (isNewArchitectureEnabled()) { | ||
| implementation project(':ReactAndroid') | ||
| } else { | ||
| implementation 'com.facebook.react:react-native:+' | ||
| } | ||
|
|
||
| if (shouldUseCommonInterfaceFromReanimated()) { | ||
| // Include Reanimated as dependency to load the common interface | ||
| implementation (rootProject.subprojects.find { it.name == 'react-native-reanimated' }) { | ||
| exclude group:'com.facebook.fbjni' // resolves "Duplicate class com.facebook.jni.CppException" | ||
| } | ||
| } | ||
|
|
||
| implementation 'androidx.appcompat:appcompat:1.2.0' | ||
| implementation "androidx.core:core-ktx:1.6.0" | ||
| implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" | ||
| } | ||
|
|
||
| if (isNewArchitectureEnabled()) { | ||
| // Resolves "LOCAL_SRC_FILES points to a missing file, Check that libfb.so exists or that its path is correct". | ||
| tasks.whenTaskAdded { task -> | ||
| if (task.name.contains("configureCMakeDebug")) { | ||
| rootProject.getTasksByName("packageReactNdkDebugLibs", true).forEach { | ||
| task.dependsOn(it) | ||
| } | ||
| } | ||
| // We want to add a dependency for both configureCMakeRelease and configureCMakeRelWithDebInfo | ||
| if (task.name.contains("configureCMakeRel")) { | ||
| rootProject.getTasksByName("packageReactNdkReleaseLibs", true).forEach { | ||
| task.dependsOn(it) | ||
| } | ||
| } | ||
| } | ||
| } | ||
2 changes: 1 addition & 1 deletion
2
...dler/common/GestureHandlerStateManager.kt → ...sion/common/GestureHandlerStateManager.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
android/vendored/unversioned/react-native-gesture-handler/android/gradle.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # Project-wide Gradle settings. | ||
|
|
||
| # IDE (e.g. Android Studio) users: | ||
| # Gradle settings configured through the IDE *will override* | ||
| # any settings specified in this file. | ||
|
|
||
| # For more details on how to configure your build environment visit | ||
| # http://www.gradle.org/docs/current/userguide/build_environment.html | ||
|
|
||
| # Specifies the JVM arguments used for the daemon process. | ||
| # The setting is particularly useful for tweaking memory settings. | ||
| # Default value: -Xmx10248m -XX:MaxPermSize=256m | ||
| org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 | ||
|
|
||
| # When configured, Gradle will run in incubating parallel mode. | ||
| # This option should only be used with decoupled projects. More details, visit | ||
| # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects | ||
| # org.gradle.parallel=true | ||
| RNGH_kotlinVersion=1.6.21 |
3 changes: 3 additions & 0 deletions
3
...endored/unversioned/react-native-gesture-handler/android/lib/src/main/AndroidManifest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| package="com.swmansion.gesturehandler"> | ||
| </manifest> |
2 changes: 1 addition & 1 deletion
2
...i/components/gesturehandler/Extensions.kt → ...om/swmansion/gesturehandler/Extensions.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh no! gesture-handler has cpp code now, even though it's for fabric only 🤦♂️
that would increase the complexity in versioning the vendored module.
i'm just taking a note that i should aware of this 😅