Diff between wp-fork branch and main repo's default branch

.github/workflows/android-build.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        working-directory: [example, FabricExample]
+        working-directory: [example]
     concurrency:
       group: android-${{ github.ref }}
       cancel-in-progress: true

.github/workflows/ios-build.yml

@@ -12,6 +12,8 @@ jobs:
     strategy:
       matrix:
         working-directory: [example, FabricExample]
+        xcode: ['13.2.1']
+        device: ['iPhone 13']
     concurrency:
       group: ios-${{ github.ref }}
       cancel-in-progress: true
@@ -29,6 +31,10 @@ jobs:
       - name: Install pods
         working-directory: ${{ matrix.working-directory }}/ios
         run: pod install
+      - name: Switch Xcode version to ${{ matrix.xcode }}
+        run: sudo xcode-select --switch /Applications/Xcode_${{ matrix.xcode }}.app
+      - name: Force update Launch Database to prevent issues when opening the Simulator app
+        run: /System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister -f /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer/Applications/Simulator.app
       - name: Build app
         working-directory: ${{ matrix.working-directory }}
         run: yarn ios

.github/workflows/static-example-apps-checks.yml

@@ -3,7 +3,7 @@ on:
   pull_request:
     paths:
       - 'example/**'
-      - 'FabricExample/**'
+      # - 'FabricExample/**'
   push:
     branches:
       - main

RNGestureHandler.podspec

@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.homepage     = "https://github.com/software-mansion/react-native-gesture-handler"
   s.license      = "MIT"
   s.author       = { package["author"]["name"] => package["author"]["email"] }
-  s.source       = { :git => "https://github.com/software-mansion/react-native-gesture-handler", :tag => "#{s.version}" }
+  s.source       = { :git => "https://github.com/wordpress-mobile/react-native-gesture-handler", :tag => "#{s.version}" }
   s.source_files = "ios/**/*.{h,m,mm}"
   s.requires_arc = true
 

android/build.gradle

@@ -2,13 +2,17 @@ import groovy.json.JsonSlurper
 import java.nio.file.Paths
 
 buildscript {
+    ext.isStandaloneProject = (project == rootProject)
+
     def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['RNGH_kotlinVersion']
 
     repositories {
         mavenCentral()
+        google()
     }
 
     dependencies {
+        classpath("com.android.tools.build:gradle:4.1.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
@@ -40,10 +44,7 @@ if (isNewArchitectureEnabled()) {
 }
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-}
+apply plugin: 'maven-publish'
 
 // Check whether Reanimated 2.3 or higher is installed alongside Gesture Handler
 def shouldUseCommonInterfaceFromReanimated() {
@@ -55,16 +56,19 @@ def shouldUseCommonInterfaceFromReanimated() {
         def (major, minor, patch) = reanimatedVersion.tokenize('.')
         return (Integer.parseInt(major) == 2 && Integer.parseInt(minor) >= 3) || Integer.parseInt(major) == 3
     } else {
-        return false
+        // In Gutenberg, we use a Reanimated version higher than 2.3. Therefore, we have to
+        // assure that the common interface is always used to prevent duplicating the class.
+        return true;
     }
 }
 
 repositories {
     mavenCentral()
+    google()
 }
 
 android {
-    compileSdkVersion safeExtGet("compileSdkVersion", 28)
+    compileSdkVersion 31
 
     // 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)
@@ -76,8 +80,8 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 16)
-        targetSdkVersion safeExtGet('targetSdkVersion', 28)
+        minSdkVersion 21
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
@@ -119,6 +123,10 @@ android {
         // only the ones that make the build fail (ideally we should only include librngesturehandler_modules but we
         // are only allowed to specify exclude patterns)
         exclude "**/libreact_render*.so"
+
+        // Exclude files to avoid 'duplicate files during packaging' errors
+        // when building an app that incorporates this package as a dependency
+        exclude 'META-INF/android_release.kotlin_module'
     }
 
     // Include "lib/" as sources, unfortunately react-native link can't handle
@@ -148,20 +156,48 @@ android {
     }
 }
 
-def kotlin_version = safeExtGet('kotlinVersion', project.properties['RNGH_kotlinVersion'])
+allprojects {
+    repositories {
+        if (isStandaloneProject) {
+            maven { url "https://a8c-libs.s3.amazonaws.com/android/react-native-mirror" }
+        } else {
+            // When building as a dep, the RN's maven repo is locally in the node_modules folder
+            def nodeModulesPath = "${project.buildDir}/../../node_modules/"
+            maven { url "${nodeModulesPath}/react-native/android" }
+        }
+
+        google()
+        jcenter()
+        mavenCentral()
+        maven { url 'https://jitpack.io' }
+    }
+}
+
+def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['RNGH_kotlinVersion']
 
 dependencies {
     //noinspection GradleDynamicVersion
     if (isNewArchitectureEnabled()) {
         implementation project(':ReactAndroid')
     } else {
-        implementation 'com.facebook.react:react-native:+'
+        if (isStandaloneProject) {
+            // If this is the root project (e.g. Jitpack), specify a version
+            implementation 'com.facebook.react:react-native:0.69.4'
+        } else {
+            implementation 'com.facebook.react:react-native:+'
+        }
     }
 
     if (shouldUseCommonInterfaceFromReanimated()) {
         // Include Reanimated as dependency to load the common interface
-        implementation (project(':react-native-reanimated')) {
-            exclude group:'com.facebook.fbjni' // resolves "Duplicate class com.facebook.jni.CppException"
+        if (isStandaloneProject) {
+            implementation ("com.github.wordpress-mobile:react-native-reanimated:2.9.1-wp-1") {
+                exclude group:'com.facebook.fbjni' // resolves "Duplicate class com.facebook.jni.CppException"
+            }
+        } else {
+            implementation (project(':react-native-reanimated')) {
+                exclude group:'com.facebook.fbjni' // resolves "Duplicate class com.facebook.jni.CppException"
+            }
         }
     }
 
@@ -179,3 +215,15 @@ if (isNewArchitectureEnabled()) {
         codegenJavaPackageName = "com.swmansion.gesturehandler"
     }
 }
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+                groupId = 'com.github.wordpress-mobile'
+                artifactId = 'react-native-gesture-handler'
+            }
+        }
+    }
+}

android/gradle.properties

@@ -1,19 +1,8 @@
-# Project-wide Gradle settings.
+org.gradle.jvmargs=-Xmx1536m -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.parallel=true
+org.gradle.configureondemand=true
+org.gradle.caching=true
 
-# 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
+android.useAndroidX=true
+android.enableJetifier=true
 RNGH_kotlinVersion=1.5.20

android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists