merge with next

Author: akwasniewski

.github/workflows/macos-build.yml

@@ -16,7 +16,7 @@ jobs:
   build:
     if: github.repository == 'software-mansion/react-native-gesture-handler'
 
-    runs-on: macos-15
+    runs-on: macos-15-xlarge
     env:
       WORKING_DIRECTORY: apps/macos-example
     concurrency:

.lintstagedrc.json

@@ -6,6 +6,5 @@
     "yarn format:android"
   ],
   "packages/react-native-gesture-handler/apple/**/*.{h,m,mm,cpp}": "yarn format:apple",
-  "packages/react-native-gesture-handler/{shared,android/src}/**/*.{h,cpp}": "yarn format:cpp",
-  "packages/react-native-gesture-handler/src/specs/*.ts": "yarn workspace react-native-gesture-handler sync-architectures"
+  "packages/react-native-gesture-handler/{shared,android/src}/**/*.{h,cpp}": "yarn format:cpp"
 }

.yarn/patches/@react-native-community-slider-npm-4.5.7-658e0e58c9.patch

@@ -0,0 +1,42 @@
+diff --git a/android/src/main/jni/CMakeLists.txt b/android/src/main/jni/CMakeLists.txt
+index f720c8e8808c01eab3446b0a819f48aa355077de..0484a6409c2c92ab6971a9b8d607e800a54dea9c 100644
+--- a/android/src/main/jni/CMakeLists.txt
++++ b/android/src/main/jni/CMakeLists.txt
+@@ -9,15 +9,6 @@ set(LIB_COMMON_DIR ${LIB_ANDROID_DIR}/../common/cpp)
+ set(LIB_ANDROID_GENERATED_JNI_DIR ${LIB_ANDROID_DIR}/build/generated/source/codegen/jni)
+ set(LIB_ANDROID_GENERATED_COMPONENTS_DIR ${LIB_ANDROID_GENERATED_JNI_DIR}/react/renderer/components/${LIB_LITERAL})
+ 
+-add_compile_options(
+-  -fexceptions
+-  -frtti
+-  -std=c++20
+-  -Wall
+-  -Wpedantic
+-  -Wno-gnu-zero-variadic-macro-arguments
+-)
+-
+ file(GLOB LIB_CUSTOM_SRCS CONFIGURE_DEPENDS *.cpp ${LIB_COMMON_DIR}/react/renderer/components/${LIB_LITERAL}/*.cpp)
+ file(GLOB LIB_CODEGEN_SRCS CONFIGURE_DEPENDS ${LIB_ANDROID_GENERATED_JNI_DIR}/*.cpp ${LIB_ANDROID_GENERATED_COMPONENTS_DIR}/*.cpp)
+ 
+@@ -70,6 +61,21 @@ else()
+   )
+ endif()
+ 
++if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 80)
++  target_compile_reactnative_options(${LIB_TARGET_NAME} PUBLIC)
++else()
++  target_compile_options(
++    ${LIB_TARGET_NAME}
++    PRIVATE
++    -fexceptions
++    -frtti
++    -std=c++20
++    -Wall
++    -Wpedantic
++    -Wno-gnu-zero-variadic-macro-arguments
++  )
++endif()
++
+ target_compile_options(
+   ${LIB_TARGET_NAME}
+   PRIVATE

README.md

@@ -35,6 +35,7 @@ You will need to have an Android or iOS device or emulator connected.
 
 | version | react-native version |
 | ------- | -------------------- |
+| 2.28.0+ | 0.79.0+              |
 | 2.26.0+ | 0.78.0+              |
 | 2.25.0+ | 0.76.0+              |
 | 2.24.0+ | 0.75.0+              |

apps/basic-example/android/build.gradle

@@ -1,9 +1,9 @@
 buildscript {
     ext {
-        buildToolsVersion = "35.0.0"
+        buildToolsVersion = "36.0.0"
         minSdkVersion = 24
-        compileSdkVersion = 35
-        targetSdkVersion = 35
+        compileSdkVersion = 36
+        targetSdkVersion = 36
         ndkVersion = "27.1.12297006"
         kotlinVersion = "2.1.20"
         isGHExampleApp = true

apps/basic-example/android/gradle.properties

@@ -37,3 +37,8 @@ newArchEnabled=true
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
 hermesEnabled=true
+
+# Use this property to enable edge-to-edge display support.
+# This allows your app to draw behind system bars for an immersive UI.
+# Note: Only works with ReactActivity and should not be used with custom Activity.
+edgeToEdgeEnabled=false

apps/basic-example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME