Make osx example utilise the common example app

.github/workflows/macos-build.yml

@@ -13,7 +13,7 @@ on:
 jobs:
   build:
     if: github.repository == 'software-mansion/react-native-gesture-handler'
-    runs-on: macos-12
+    runs-on: macos-15
     strategy:
       matrix:
         working-directory: [MacOSExample]
@@ -23,10 +23,10 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v2
-      - name: Use Node.js 16
+      - name: Use Node.js 22
         uses: actions/setup-node@v2
         with:
-          node-version: 16
+          node-version: 22
           cache: 'yarn'
       - name: Install node dependencies
         working-directory: ${{ matrix.working-directory }}

MacOSExample/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-gem 'cocoapods', '~> 1.12'
+gem 'cocoapods', '~> 1.15.2'

MacOSExample/Gemfile.lock

@@ -1,33 +1,36 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
-    activesupport (7.1.3)
+    activesupport (7.2.1)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.8)
     claide (1.1.0)
-    cocoapods (1.14.2)
+    cocoapods (1.15.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.14.2)
+      cocoapods-core (= 1.15.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -40,7 +43,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
       xcodeproj (>= 1.23.0, < 2.0)
-    cocoapods-core (1.14.2)
+    cocoapods-core (1.15.2)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -60,50 +63,48 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
-    drb (2.2.0)
-      ruby2_keywords
+    drb (2.2.1)
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    ffi (1.16.3)
+    ffi (1.17.0)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    json (2.7.1)
-    minitest (5.21.2)
+    json (2.7.2)
+    logger (1.6.1)
+    minitest (5.25.1)
     molinillo (0.8.0)
-    mutex_m (0.2.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
+    nkf (0.2.0)
     public_suffix (4.0.7)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.7)
     ruby-macho (2.5.1)
-    ruby2_keywords (0.0.5)
-    strscan (3.1.0)
+    securerandom (0.3.1)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    xcodeproj (1.24.0)
+    xcodeproj (1.25.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
+      rexml (>= 3.3.2, < 4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.12)
+  cocoapods (~> 1.15.2)
 
 RUBY VERSION
    ruby 3.0.0p0

MacOSExample/babel.config.js

@@ -2,7 +2,7 @@ module.exports = {
   presets: ['module:metro-react-native-babel-preset'],
   plugins: [
     '@babel/plugin-transform-modules-commonjs',
-    'react-native-reanimated/plugin',
+    ['@babel/plugin-transform-private-methods', { loose: true }],
     [
       'module-resolver',
       {
@@ -11,13 +11,14 @@ module.exports = {
           react: './node_modules/react',
           'react-native': './node_modules/react-native-macos',
           'react-native-reanimated': './node_modules/react-native-reanimated',
-          '@babel': './node_modules/@babel',
-          '@egjs/hammerjs': './node_modules/@egjs/hammerjs',
-          fbjs: './node_modules/fbjs',
-          'hoist-non-react-statics': './node_modules/hoist-non-react-statics',
-          invariant: './node_modules/invariant',
+          'react-native-gesture-handler/ReanimatedSwipeable':
+            '../src/components/ReanimatedSwipeable',
+          'react-native-gesture-handler/Swipeable':
+            '../src/components/Swipeable',
+          'react-native-gesture-handler': '../src/index',
         },
       },
     ],
+    'react-native-reanimated/plugin',
   ],
 };

MacOSExample/index.js

@@ -3,7 +3,7 @@
  */
 
 import { AppRegistry } from 'react-native';
-import App from './src/App';
+import App from '../example/App';
 import { name as appName } from './app.json';
 
 AppRegistry.registerComponent(appName, () => App);

MacOSExample/macos/.gitignore

@@ -1,2 +1,4 @@
 # CocoaPods
 Pods/
+
+*.local

MacOSExample/macos/MacOSExample-macOS/AppDelegate.mm

@@ -14,7 +14,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification
   return [super applicationDidFinishLaunching:notification];
 }
 
-- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+- (NSURL *)bundleURL
 {
 #if DEBUG
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
@@ -23,6 +23,11 @@ - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 #endif
 }
 
+- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+{
+  return [self bundleURL];
+}
+
 /// This method controls whether the `concurrentRoot`feature of React18 is turned on or off.
 ///
 /// @see: https://reactjs.org/blog/2022/03/29/react-v18.html