@amazon-devices/react-native-gesture-handler 2.0.9000000000 → 4.0.0-rn-83

package/SystemModules/amzn__react-native-gesture-handler-4.modules.txt

@@ -0,0 +1,79 @@
+node_modules/@amzn/react-native-gesture-handler_4/src/index.ts:a7cdeef73becacd6d26b
+node_modules/@amzn/react-native-gesture-handler_4/src/components/GestureButtons.tsx:f19ebd1d75a9c4061334
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/createNativeWrapper.tsx:7ce6f0dd88156ab79769
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/NativeViewGestureHandler.ts:7a2c4dccaaad8b479a2b
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/createHandler.tsx:2b9258bb82d448c5f5cf
+node_modules/@amzn/react-native-gesture-handler_4/src/RNGestureHandlerModule.kepler.ts:45c7f79543976a31ff11
+node_modules/@amzn/react-native-gesture-handler_4/src/findNodeHandle.ts:cd23c68f8c91d4f4208b
+node_modules/@amzn/react-native-gesture-handler_4/src/GestureHandlerRootViewContext.ts:e4cb06c3a9ffe60c1567
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/customDirectEventTypes.ts:c2bcc5af447368ee040b
+node_modules/@amzn/react-native-gesture-handler_4/src/utils.ts:9290b6993bf67eb92c55
+node_modules/@amzn/react-native-gesture-handler_4/src/State.ts:a8175d64bf99e0f199c3
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/getNextHandlerTag.ts:67b6780b6cc2536c070a
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/handlersRegistry.ts:6baf7167a4d73a16b5c5
+node_modules/@amzn/react-native-gesture-handler_4/src/ActionType.ts:a524b8d562f1c3758773
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/utils.ts:3ab094704fce36219435
+node_modules/@amzn/react-native-gesture-handler_4/src/ghQueueMicrotask.ts:8b8b3407dbb3ba998eb2
+node_modules/@amzn/react-native-gesture-handler_4/src/mountRegistry.ts:ffeb22d85d00bece7bf4
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestureHandlerCommon.ts:d4f6e5e63a176e8f633c
+node_modules/@amzn/react-native-gesture-handler_4/src/components/GestureHandlerButton.tsx:783d25e79e3fd451880c
+node_modules/@amzn/react-native-gesture-handler_4/src/specs/RNGestureHandlerButtonNativeComponent.kepler.ts:817b602ab6cfe271e874
+node_modules/@amzn/react-native-gesture-handler_4/src/Directions.ts:ae7acf98a2b46b49f5c9
+node_modules/@amzn/react-native-gesture-handler_4/src/components/GestureComponents.tsx:e78390f44227695f7054
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/FlingGestureHandler.ts:950a8977d7b41a21bb08
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/ForceTouchGestureHandler.ts:23b3ec6742c853cf691e
+node_modules/@amzn/react-native-gesture-handler_4/src/PlatformConstants.kepler.ts:8bb3f83257638f500a01
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/gestureObjects.ts:c6672927606bbbef8e79
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/tapGesture.ts:300fe2e169d2fd53afc5
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/gesture.ts:be6b3dcdd693dec8bbf3
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/panGesture.ts:9cdd50391b10510ececa
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/pinchGesture.ts:dcd1f15b5641ed7617ad
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/rotationGesture.ts:83518ea597a2fe5b4491
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/flingGesture.ts:1c2e0710b9c4f25ba7b9
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/longPressGesture.ts:690c412bfa2779fbf293
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/forceTouchGesture.ts:de7f43aa39d994564ef1
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/nativeGesture.ts:0c01231da94764ab7197
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/manualGesture.ts:01fee7839fec0a306d80
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/hoverGesture.ts:ef414fb208585597bfd5
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/gestureComposition.ts:3e29f22a98b95959203c
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/GestureDetector/index.tsx:baecc0000dc8032ecde6
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/GestureDetector/utils.ts:bb9d0dd8f87ada56e610
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/TapGestureHandler.ts:ffaa1b7bb04ac95e37cc
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/PanGestureHandler.ts:04d046b850a49e900cac
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/LongPressGestureHandler.ts:0c2c3477d805a158ad56
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/reanimatedWrapper.ts:673a9d2004db646f4472
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/eventReceiver.ts:fb6fd3116d6f8efc2d45
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/gestureStateManager.ts:31ac636ec932f308089e
+node_modules/@amzn/react-native-gesture-handler_4/src/TouchEventType.ts:ed4c5921eaa6e69d7856
+node_modules/@amzn/react-native-gesture-handler_4/src/EnableNewWebImplementation.ts:37eb3d683da90ef562f1
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/GestureDetector/useDetectorUpdater.ts:4c03ba20f7c5f9c39c69
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/GestureDetector/needsToReattach.ts:73525ea0554af2b05eb0
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/GestureDetector/dropHandlers.ts:a0c5d257a0a2edd93a6c
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/GestureDetector/attachHandlers.ts:e6b79e3c92e41c66e2c1
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/GestureDetector/updateHandlers.ts:124d660bdf589f00af04
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/GestureDetector/useViewRefHandler.ts:8ae64b594140baa70b60
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/GestureDetector/useAnimatedGesture.ts:65c0767f26d3aa35e3f0
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/GestureDetector/useMountReactions.ts:c5c138ed6f4be746555b
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/gestures/GestureDetector/Wrap.tsx:2ed7f1a71efcb3408a6f
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/PinchGestureHandler.ts:aed2ddfce14e62d6dc5f
+node_modules/@amzn/react-native-gesture-handler_4/src/PointerType.ts:6d03b5427fc3f2587ae9
+node_modules/@amzn/react-native-gesture-handler_4/src/handlers/RotationGestureHandler.ts:000f0ab0938bfd38d5a4
+node_modules/@amzn/react-native-gesture-handler_4/src/components/Text.tsx:af2fcd8429dac9e42250
+node_modules/@amzn/react-native-gesture-handler_4/src/components/touchables/index.ts:99eed9b36ad8c8f4486b
+node_modules/@amzn/react-native-gesture-handler_4/src/components/touchables/TouchableNativeFeedback.tsx:5b9496a7dab3b8e7f6c4
+node_modules/@amzn/react-native-gesture-handler_4/src/components/touchables/TouchableWithoutFeedback.tsx:d879350f8e2da59f7873
+node_modules/@amzn/react-native-gesture-handler_4/src/components/touchables/GenericTouchable.tsx:3f7956a46aeea87f5638
+node_modules/@amzn/react-native-gesture-handler_4/src/components/touchables/TouchableOpacity.tsx:ad09242290bd8463dcb4
+node_modules/@amzn/react-native-gesture-handler_4/src/components/touchables/TouchableHighlight.tsx:9236fe1c4e80bde7de4c
+node_modules/@amzn/react-native-gesture-handler_4/src/components/gestureHandlerRootHOC.tsx:b51cf364886c20929fce
+node_modules/@amzn/react-native-gesture-handler_4/src/components/GestureHandlerRootView.kepler.tsx:df7b8e9c969695b16562
+node_modules/@amzn/react-native-gesture-handler_4/src/specs/RNGestureHandlerRootViewNativeComponent.kepler.ts:fccfb8238dd26ea6d2c2
+node_modules/@amzn/react-native-gesture-handler_4/src/components/Swipeable.tsx:fb44e2ef4105e347e767
+node_modules/@amzn/react-native-gesture-handler_4/src/components/Pressable/index.ts:2f433a1c949bf7547bdb
+node_modules/@amzn/react-native-gesture-handler_4/src/components/Pressable/Pressable.tsx:38ff8f37f62c837e9f21
+node_modules/@amzn/react-native-gesture-handler_4/src/components/Pressable/utils.ts:554a00d2621fc5c77db6
+node_modules/@amzn/react-native-gesture-handler_4/src/components/Pressable/StateMachine.tsx:769a98bdc113e31fc536
+node_modules/@amzn/react-native-gesture-handler_4/src/components/Pressable/stateDefinitions.ts:e92730153d5f66232474
+node_modules/@amzn/react-native-gesture-handler_4/src/components/utils.ts:89beec83f7be097d6254
+node_modules/@amzn/react-native-gesture-handler_4/src/components/DrawerLayout.tsx:37d450bd1e7c0ec9fddf
+node_modules/@amzn/react-native-gesture-handler_4/src/init.ts:9f696fab19ac8bd2d9e1

package/SystemModules/amzn__react-native-gesture-handler-4.private.modules.txt

@@ -0,0 +1,67 @@
+node_modules/@babel/runtime_7.29.2/helpers/interopRequireDefault.js:d3b57c8ff490ba8c7c47
+node_modules/@babel/runtime_7.29.2/helpers/objectWithoutProperties.js:54be67f13f7547a51521
+node_modules/@babel/runtime_7.29.2/helpers/objectWithoutPropertiesLoose.js:ae112a2672a8a53f82e5
+node_modules/@babel/runtime_7.29.2/helpers/classCallCheck.js:2bfb5e99807ec81b822f
+node_modules/@babel/runtime_7.29.2/helpers/createClass.js:cc42269051bc9ff17a63
+node_modules/@babel/runtime_7.29.2/helpers/toPropertyKey.js:7519d1b9ea0de500d604
+node_modules/@babel/runtime_7.29.2/helpers/toPrimitive.js:6c47e04d255cdfb1533c
+node_modules/@babel/runtime_7.29.2/helpers/typeof.js:7b6247ce00695d888c36
+node_modules/@babel/runtime_7.29.2/helpers/possibleConstructorReturn.js:80a4a0ee188e065108c9
+node_modules/@babel/runtime_7.29.2/helpers/assertThisInitialized.js:7a9699b26019ae7270f5
+node_modules/@babel/runtime_7.29.2/helpers/getPrototypeOf.js:9c829ff5032996ffdc8e
+node_modules/@babel/runtime_7.29.2/helpers/inherits.js:3ebfecb28bc5857801a2
+node_modules/@babel/runtime_7.29.2/helpers/setPrototypeOf.js:ea37d1dec222e5845b2b
+node_modules/@babel/runtime_7.29.2/helpers/get.js:659b028086c2c6f074a3
+node_modules/@babel/runtime_7.29.2/helpers/superPropBase.js:263943b885b53437e9e0
+node_modules/@babel/runtime_7.29.2/helpers/classPrivateFieldLooseBase.js:8e4a72d63eec1bceb909
+node_modules/@babel/runtime_7.29.2/helpers/classPrivateFieldLooseKey.js:3998b40f87a7681fa397
+node_modules/invariant_2.2.4/browser.js:fd099686726b2dfb6f66
+node_modules/@babel/runtime_7.29.2/helpers/slicedToArray.js:8972a767e9133b0e3a28
+node_modules/@babel/runtime_7.29.2/helpers/arrayWithHoles.js:ee99881fa9643e7bd96f
+node_modules/@babel/runtime_7.29.2/helpers/iterableToArrayLimit.js:1847ec9d510321afd855
+node_modules/@babel/runtime_7.29.2/helpers/unsupportedIterableToArray.js:0c30490eff100ca51d7c
+node_modules/@babel/runtime_7.29.2/helpers/arrayLikeToArray.js:93f664c5afc3b3c0ffb9
+node_modules/@babel/runtime_7.29.2/helpers/nonIterableRest.js:9ef80b625777ecb8d705
+node_modules/@react-native/normalize-colors_0.83.0/index.js:e8e087936fed8afe0814
+node_modules/nullthrows_1.1.1/nullthrows.js:afd4874b36ccd4e13961
+node_modules/@react-native/assets-registry_0.83.0/registry.js:5ff9e23a9ba5a1a1e0ac
+node_modules/@react-native/assets-registry_0.83.0/path-support.js:fb4eb45d6b2fc494317c
+node_modules/@babel/runtime_7.29.2/helpers/wrapNativeSuper.js:b510ad86a9e18c7a79b6
+node_modules/@babel/runtime_7.29.2/helpers/isNativeFunction.js:74c2adc9de6e582a35f1
+node_modules/@babel/runtime_7.29.2/helpers/construct.js:d66ad0c399283f558869
+node_modules/@babel/runtime_7.29.2/helpers/isNativeReflectConstruct.js:22840e4117f5dbcb3b06
+node_modules/promise_8.3.0/setimmediate/es6-extensions.js:a7846fdeffeb1ebf6241
+node_modules/promise_8.3.0/setimmediate/core.js:890f60fa94d3f6854a19
+node_modules/promise_8.3.0/setimmediate/finally.js:15bc4ccb25fc2d0c4428
+node_modules/stacktrace-parser_0.1.11/dist/stack-trace-parser.cjs.js:aa725aa4c0b37e1add33
+node_modules/regenerator-runtime_0.13.11/runtime.js:af823d9710c534173a4d
+node_modules/base64-js_1.5.1/index.js:71af70f51435e3e1b37b
+node_modules/whatwg-fetch_3.6.20/dist/fetch.umd.js:ca4b0363146267ef3e77
+node_modules/abort-controller_3.0.0/dist/abort-controller.js:ea8fcbd647aab1cfcdaa
+node_modules/event-target-shim_5.0.1/dist/event-target-shim.js:2bd3f165b1ed6b916de7
+node_modules/scheduler_0.27.0/index.native.js:ec9ec59f48073ee6e9f5
+node_modules/scheduler_0.27.0/cjs/scheduler.native.production.js:d8f1930d0c79328207a3
+node_modules/@babel/runtime_7.29.2/helpers/readOnlyError.js:b769be1a7481ccdab905
+node_modules/@react-native/virtualized-lists_0.83.0/index.js:a7726730afdc356adbe4
+node_modules/@react-native/virtualized-lists_0.83.0/Lists/VirtualizeUtils.js:d0ff6d3d1f2c9580ab13
+node_modules/@react-native/virtualized-lists_0.83.0/Lists/VirtualizedList.js:8d139349672eea405ffb
+node_modules/@react-native/virtualized-lists_0.83.0/Utilities/clamp.js:a78a6606e498a2fdbf2d
+node_modules/@react-native/virtualized-lists_0.83.0/Utilities/infoLog.js:017b2813127d2e7f4d70
+node_modules/@react-native/virtualized-lists_0.83.0/Lists/ChildListCollection.js:9c3630060e6e634bfb8b
+node_modules/@react-native/virtualized-lists_0.83.0/Lists/FillRateHelper.js:c1e83141f045b25e26fc
+node_modules/@react-native/virtualized-lists_0.83.0/Lists/ListMetricsAggregator.js:480fcd792bed2eb457f3
+node_modules/@react-native/virtualized-lists_0.83.0/Lists/StateSafePureComponent.js:fd4823cbe6aa108a7d62
+node_modules/@react-native/virtualized-lists_0.83.0/Lists/ViewabilityHelper.js:a44a41089be71f9f7b1e
+node_modules/@react-native/virtualized-lists_0.83.0/Lists/VirtualizedListCellRenderer.js:8aa7cf31c704a4a85db2
+node_modules/@react-native/virtualized-lists_0.83.0/Lists/VirtualizedListContext.js:4b89f56515b0628d3446
+node_modules/@react-native/virtualized-lists_0.83.0/Lists/VirtualizedListProps.js:516cf3cf4ecb4e256407
+node_modules/@react-native/virtualized-lists_0.83.0/Lists/CellRenderMask.js:95aa36c0870d6d5cfdb1
+node_modules/@react-native/virtualized-lists_0.83.0/Lists/VirtualizedSectionList.js:cb8631f113fda0d4a92c
+node_modules/memoize-one_5.2.1/dist/memoize-one.cjs.js:d381691ed29bec5a2050
+node_modules/@babel/runtime_7.29.2/helpers/asyncToGenerator.js:37d2d0df8e62891cc30d
+node_modules/react-native-is-edge-to-edge_1.3.1/dist/index.js:8340eb6e37f54f6d753a
+node_modules/@babel/runtime_7.29.2/helpers/toArray.js:faa875ac6e1fab533258
+node_modules/@babel/runtime_7.29.2/helpers/iterableToArray.js:a557e0618dee554f2e2b
+node_modules/hoist-non-react-statics_3.3.2/dist/hoist-non-react-statics.cjs.js:7458da686fa6b2cad882
+node_modules/react-is_16.13.1/index.js:4ca711edf8a94602feee
+node_modules/react-is_16.13.1/cjs/react-is.production.min.js:e182cded7e266b7ca366

package/SystemModules/keplerscript-system-bundle-config.json

@@ -1,7 +1,7 @@
 {
   "@amzn/react-native-gesture-handler": {
-    "nameOnDevice": "index.amzn__react-native-gesture-handler-2.hermes.bundle",
-    "modulesPath": "amzn__react-native-gesture-handler-2.modules.txt",
-    "privateModulesPath": "amzn__react-native-gesture-handler-2.private.modules.txt"
+    "nameOnDevice": "index.amzn__react-native-gesture-handler-4.hermes.bundle",
+    "modulesPath": "amzn__react-native-gesture-handler-4.modules.txt",
+    "privateModulesPath": "amzn__react-native-gesture-handler-4.private.modules.txt"
   }
 }

package/android/build.gradle

@@ -1,23 +1,18 @@
 import groovy.json.JsonSlurper
-
-import javax.inject.Inject
-import java.nio.file.Files
+import com.android.build.gradle.tasks.ExternalNativeBuildJsonTask
 
 buildscript {
     def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['RNGH_kotlinVersion']
 
     repositories {
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
         mavenCentral()
         google()
     }
 
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
-        classpath("com.android.tools.build:gradle:7.2.1")
-        classpath("com.diffplug.spotless:spotless-plugin-gradle:6.7.2")
+        classpath("com.android.tools.build:gradle:8.10.1")
+        classpath("com.diffplug.spotless:spotless-plugin-gradle:7.0.4")
     }
 }
 
@@ -33,34 +28,39 @@ def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
+def isGHExampleApp() {
+    return safeExtGet("isGHExampleApp", false)
+}
+
 def resolveReactNativeDirectory() {
     def reactNativeLocation = safeExtGet("REACT_NATIVE_NODE_MODULES_DIR", null)
     if (reactNativeLocation != null) {
         return file(reactNativeLocation)
     }
 
-    // monorepo workaround
-    // react-native can be hoisted or in project's own node_modules
-    def reactNativeFromProjectNodeModules = file("${rootProject.projectDir}/../node_modules/react-native")
-    if (reactNativeFromProjectNodeModules.exists()) {
-        return reactNativeFromProjectNodeModules
-    }
+    // Fallback to node resolver for custom directory structures like monorepos.
+    def reactNativePackage = file(
+        providers.exec {
+            workingDir(rootDir)
+            commandLine("node", "--print", "require.resolve('react-native/package.json')")
+        }.standardOutput.asText.get().trim()
+    )
 
-    def reactNativeFromNodeModulesWithReanimated = file("${projectDir}/../../react-native")
-    if (reactNativeFromNodeModulesWithReanimated.exists()) {
-        return reactNativeFromNodeModulesWithReanimated
+    if (reactNativePackage.exists()) {
+        return reactNativePackage.parentFile
     }
 
     throw new Exception(
-        "[react-native-gesture-handler] Unable to resolve react-native location in " +
-            "node_modules. You should add project extension property (in app/build.gradle) " +
-            "`REACT_NATIVE_NODE_MODULES_DIR` with path to react-native."
+            "[react-native-gesture-handler] Unable to resolve react-native location in " +
+                    "node_modules. You should add project extension property (in app/build.gradle) " +
+                    "`REACT_NATIVE_NODE_MODULES_DIR` with path to react-native."
     )
 }
 
 if (isNewArchitectureEnabled()) {
     apply plugin: 'com.facebook.react'
 }
+
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
@@ -68,18 +68,45 @@ if (project == rootProject) {
     apply from: "spotless.gradle"
 }
 
+def getExternalLibVersion(project){
+    def inputFile = new File(project.projectDir, "../package.json")
+    def json = new JsonSlurper().parseText(inputFile.text)
+    def libVerision = json.version as String
+    def (major, minor, patch) = libVerision.tokenize('.')
+
+    // Handle cases where version is a pre-release one, e.g. "2.3.0-alpha.1"
+    def patchVersion = patch.find(/(\d+)/) ? patch.find(/(\d+)/) : "0"
+
+    return [Integer.parseInt(major), Integer.parseInt(minor), Integer.parseInt(patchVersion)]
+}
+
 // 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 {
+
+    if (reanimated == null) {
+        return false
+    }
+
+    def (major, minor, patch) = getExternalLibVersion(reanimated)
+    
+    return (major == 2 && minor >= 3) || major >= 3
+}
+
+def shouldUseCommonInterfaceFromRNSVG() {
+    // common interface compatible with react-native-svg >= 15.11.2
+    def rnsvg = rootProject.subprojects.find { it.name == 'react-native-svg' }
+
+    if (rnsvg == null) {
         return false
     }
+
+    def (major, minor, patch) = getExternalLibVersion(rnsvg)
+
+
+    return (major == 15 && minor == 11 && patch >= 2) ||
+            (major == 15 && minor > 11) ||
+            major > 15
 }
 
 def reactNativeArchitectures() {
@@ -93,7 +120,7 @@ def reactProperties = new Properties()
 file("$REACT_NATIVE_DIR/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
 
 def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME")
-def REACT_NATIVE_MINOR_VERSION = REACT_NATIVE_VERSION.startsWith("0.0.0-") ? 1000 : REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
+def REACT_NATIVE_MINOR_VERSION = REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
 
 repositories {
     mavenCentral()
@@ -101,9 +128,11 @@ repositories {
 
 android {
     compileSdkVersion safeExtGet("compileSdkVersion", 33)
-    def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
-    if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
-        namespace "com.swmansion.gesturehandler"
+
+    namespace = "com.swmansion.gesturehandler"
+    buildFeatures {
+        buildConfig = true
+        prefab = true
     }
 
     // Used to override the NDK path/version on internal CI or by allowing
@@ -115,29 +144,21 @@ android {
         ndkVersion rootProject.ext.ndkVersion
     }
 
-    if (REACT_NATIVE_MINOR_VERSION >= 71) {
-        buildFeatures {
-            prefab true
-        }
-    }
-
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 21)
+        minSdkVersion safeExtGet('minSdkVersion', 24)
         targetSdkVersion safeExtGet('targetSdkVersion', 33)
-        versionCode 1
-        versionName "1.0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
         buildConfigField "int", "REACT_NATIVE_MINOR_VERSION", REACT_NATIVE_MINOR_VERSION.toString()
 
         if (isNewArchitectureEnabled()) {
-            var appProject = rootProject.allprojects.find {it.plugins.hasPlugin('com.android.application')}
             externalNativeBuild {
                 cmake {
-                    cppFlags "-O2", "-frtti", "-fexceptions", "-Wall", "-Werror", "-std=c++17", "-DANDROID"
-                    arguments "-DAPP_BUILD_DIR=${appProject.buildDir}",
-                        "-DREACT_NATIVE_DIR=${REACT_NATIVE_DIR}",
-                        "-DANDROID_STL=c++_shared"
-                    abiFilters (*reactNativeArchitectures())
+                    cppFlags "-O2", "-frtti", "-fexceptions", "-Wall", "-Werror", "-std=c++20", "-DANDROID"
+                    arguments "-DREACT_NATIVE_DIR=${REACT_NATIVE_DIR}",
+                            "-DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION}",
+                            "-DANDROID_STL=c++_shared",
+                            "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
+                    abiFilters(*reactNativeArchitectures())
                 }
             }
         }
@@ -162,44 +183,70 @@ android {
         // 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"
+        exclude "**/libreactnative.so"
+        exclude "**/libjsi.so"
+        exclude "**/libc++_shared.so"
+        exclude "**/libfbjni.so"
     }
 
     sourceSets.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 (shouldUseCommonInterfaceFromRNSVG()) {
+                srcDirs += 'svg/src/main/java'
+            } else {
+                srcDirs += 'nosvg/src/main/java'
+            }
+
             if (isNewArchitectureEnabled()) {
-                srcDirs += 'src/fabric/java'
+                srcDirs += 'fabric/src/main/java'
             } else {
-                // this folder also includes files from codegen so the library can compile with
+                // 'paper/src/main/java' includes files from codegen so the library can compile with
                 // codegen turned off
-                srcDirs += 'src/paper/java'
+                srcDirs += 'paper/src/main/java'
             }
         }
     }
+
+    if (isGHExampleApp()) {
+        tasks.withType(ExternalNativeBuildJsonTask).configureEach {
+            compileTask ->
+                compileTask.doLast {
+                    def rootDir = new File("${project.projectDir}/..")
+                    def generated = new File("${compileTask.abi.getCxxBuildFolder()}/compile_commands.json")
+                    def output = new File("${rootDir}/compile_commands.json")
+                    output.text = generated.text
+
+                    println("Generated clangd metadata.")
+                }
+        }
+    }
 }
 
 def kotlin_version = safeExtGet('kotlinVersion', project.properties['RNGH_kotlinVersion'])
 
 dependencies {
     implementation 'com.facebook.react:react-native:+' // from node_modules
-    
+
 
     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(rootProject.subprojects.find { it.name == 'react-native-reanimated' }) {
+            // resolves "Duplicate class com.facebook.jni.CppException"
+            exclude group: 'com.facebook.fbjni'
         }
     }
 
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.core:core-ktx:1.6.0"
+    if (shouldUseCommonInterfaceFromRNSVG()) {
+        implementation rootProject.subprojects.find { it.name == 'react-native-svg' }
+    }
+
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation "androidx.core:core-ktx:1.16.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

package/android/{src/fabric → fabric/src/main}/java/com/swmansion/gesturehandler/ReactContextExtensions.kt

@@ -1,5 +1,6 @@
 package com.swmansion.gesturehandler
 
+import android.annotation.SuppressLint
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.fabric.FabricUIManager
 import com.facebook.react.uimanager.UIManagerHelper
@@ -7,6 +8,7 @@ import com.facebook.react.uimanager.common.UIManagerType
 import com.facebook.react.uimanager.events.Event
 
 fun ReactContext.dispatchEvent(event: Event<*>) {
+  @SuppressLint("WrongConstant")
   val fabricUIManager = UIManagerHelper.getUIManager(this, UIManagerType.FABRIC) as FabricUIManager
   fabricUIManager.eventDispatcher.dispatchEvent(event)
 }

package/android/gradle.properties

@@ -9,11 +9,11 @@
 
 # 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
+# Default value: -Xmx10248m -XX:MaxMetaspaceSize=256m
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=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
+RNGH_kotlinVersion=2.0.21

package/android/noreanimated/src/main/java/com/swmansion/gesturehandler/ReanimatedEventDispatcher.kt

@@ -4,7 +4,9 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.events.Event
 
 class ReanimatedEventDispatcher {
-  fun <T : Event<T>>sendEvent(event: T, reactApplicationContext: ReactContext) {
+  // This is necessary on new architecture
+  @Suppress("UNUSED_PARAMETER", "COMMENT_IN_SUPPRESSION")
+  fun <T : Event<T>> sendEvent(event: T, reactApplicationContext: ReactContext) {
     // no-op
   }
 }

package/android/nosvg/src/main/java/com/swmansion/gesturehandler/RNSVGHitTester.kt

@@ -0,0 +1,13 @@
+package com.swmansion.gesturehandler
+
+import android.view.View
+
+class RNSVGHitTester {
+  companion object {
+    @Suppress("UNUSED_PARAMETER")
+    fun isSvgElement(view: Any) = false
+
+    @Suppress("UNUSED_PARAMETER")
+    fun hitTest(view: View, posX: Float, posY: Float) = false
+  }
+}

package/android/{src/paper → paper/src/main}/java/com/facebook/react/viewmanagers/RNGestureHandlerButtonManagerDelegate.java

@@ -1,21 +1,22 @@
 /**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GeneratePropsJavaDelegate.js
- */
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
 
 package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.ColorPropConverter;
+import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
 
-public class RNGestureHandlerButtonManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNGestureHandlerButtonManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class RNGestureHandlerButtonManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNGestureHandlerButtonManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public RNGestureHandlerButtonManagerDelegate(U viewManager) {
     super(viewManager);
   }
@@ -43,6 +44,15 @@ public class RNGestureHandlerButtonManagerDelegate<T extends View, U extends Bas
       case "touchSoundDisabled":
         mViewManager.setTouchSoundDisabled(view, value == null ? false : (boolean) value);
         break;
+      case "borderWidth":
+        mViewManager.setBorderWidth(view, value == null ? 0f : ((Double) value).floatValue());
+        break;
+      case "borderColor":
+        mViewManager.setBorderColor(view, ColorPropConverter.getColor(value, view.getContext()));
+        break;
+      case "borderStyle":
+        mViewManager.setBorderStyle(view, value == null ? "solid" : (String) value);
+        break;
       default:
         super.setProperty(view, propName, value);
     }

package/android/{src/paper → paper/src/main}/java/com/facebook/react/viewmanagers/RNGestureHandlerButtonManagerInterface.java

@@ -11,8 +11,9 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNGestureHandlerButtonManagerInterface<T extends View> {
+public interface RNGestureHandlerButtonManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   void setExclusive(T view, boolean value);
   void setForeground(T view, boolean value);
   void setBorderless(T view, boolean value);
@@ -20,4 +21,7 @@ public interface RNGestureHandlerButtonManagerInterface<T extends View> {
   void setRippleColor(T view, @Nullable Integer value);
   void setRippleRadius(T view, int value);
   void setTouchSoundDisabled(T view, boolean value);
+  void setBorderWidth(T view, float value);
+  void setBorderColor(T view, @Nullable Integer value);
+  void setBorderStyle(T view, @Nullable String value);
 }

package/android/{src/paper → paper/src/main}/java/com/facebook/react/viewmanagers/RNGestureHandlerRootViewManagerDelegate.java

@@ -11,10 +11,11 @@ package com.facebook.react.viewmanagers;
 
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManager;
 import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
 
-public class RNGestureHandlerRootViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNGestureHandlerRootViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+public class RNGestureHandlerRootViewManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNGestureHandlerRootViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
   public RNGestureHandlerRootViewManagerDelegate(U viewManager) {
     super(viewManager);
   }

package/android/{src/paper → paper/src/main}/java/com/facebook/react/viewmanagers/RNGestureHandlerRootViewManagerInterface.java

@@ -10,7 +10,8 @@
 package com.facebook.react.viewmanagers;
 
 import android.view.View;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
 
-public interface RNGestureHandlerRootViewManagerInterface<T extends View> {
+public interface RNGestureHandlerRootViewManagerInterface<T extends View> extends ViewManagerWithGeneratedInterface {
   // No props
 }