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

.github/workflows/main.yml

@@ -3,7 +3,7 @@ name: Publish to GitHub Pages
 on:
   push:
     branches:
-      - main
+      - trunk
 
 jobs:
   publish:

RNReanimated.podspec

@@ -2,40 +2,9 @@ require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
-reactVersion = '0.0.0'
+reactVersion = '0.69.4'
 reactTargetTvOS = false
 
-begin
-  # standard app
-  # /appName/node_modules/react-native-reanimated/RNReanimated.podspec
-  # /appName/node_modules/react-native/package.json
-  reactJson = JSON.parse(File.read(File.join(__dir__, "..", "..", "node_modules", "react-native", "package.json")))
-  reactVersion = reactJson["version"]
-  reactTargetTvOS = reactJson["name"] == "react-native-tvos"
-rescue
-  begin
-    # monorepo
-    # /monorepo/packages/appName/node_modules/react-native-reanimated/RNReanimated.podspec
-    # /monorepo/node_modules/react-native/package.json
-    reactJson = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "node_modules", "react-native", "package.json")))
-    reactVersion = reactJson["version"]
-    reactTargetTvOS = reactJson["name"] == "react-native-tvos"
-  rescue
-    begin
-      # Example app in reanimated repo
-      # /react-native-reanimated/RNReanimated.podspec
-      # /react-native-reanimated/node_modules/react-native/package.json
-      reactJson = JSON.parse(File.read(File.join(__dir__, "node_modules", "react-native", "package.json")))
-      reactVersion = reactJson["version"]
-      reactTargetTvOS = ENV["ReanimatedTVOSExample"] == "1"
-    rescue
-      # should never happen
-      reactVersion = '0.68.0'
-      puts "[RNReanimated] Unable to recognized your `react-native` version! Default `react-native` version: " + reactVersion
-    end
-  end
-end
-
 rnVersion = reactVersion.split('.')[1]
 
 folly_prefix = ""
@@ -61,7 +30,7 @@ Pod::Spec.new do |s|
   # s.license    = { :type => "MIT", :file => "FILE_LICENSE" }
   s.author       = { "author" => "[email protected]" }
   s.platforms    = { :ios => "9.0", :tvos => "9.0" }
-  s.source       = { :git => "https://github.com/software-mansion/react-native-reanimated.git", :tag => "#{s.version}" }
+  s.source       = { :git => "https://github.com/wordpress-mobile/react-native-reanimated.git", :tag => "#{s.version}" }
 
   s.source_files = [
     "ios/**/*.{mm,h,m}",
@@ -122,4 +91,3 @@ Pod::Spec.new do |s|
   s.dependency "#{folly_prefix}Folly"
 
 end
-

android-npm/build.gradle

@@ -0,0 +1,32 @@
+import groovy.json.JsonSlurper
+import java.util.regex.Matcher
+import java.util.regex.Pattern
+configurations.maybeCreate("default")
+
+apply plugin: 'maven-publish'
+
+def reactNativeVersion = "0.69.4"
+def engine = "hermes"
+
+def (major, minor, patch) = reactNativeVersion.tokenize('.')
+def minorCopy = Integer.parseInt(minor)
+def aar = file("react-native-reanimated-${minorCopy}-${engine}.aar")
+
+if (!aar.exists()) {
+    throw new GradleException('No aar for react-native-reanimated found.')
+}
+
+artifacts.add("default", aar)
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                groupId = 'com.github.wordpress-mobile'
+                artifactId = 'react-native-reanimated'
+                artifact(aar)
+
+            }
+        }
+    }
+} 

android/build.gradle

@@ -351,7 +351,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.1.1"
+        classpath "com.android.tools.build:gradle:7.2.1"
         classpath "de.undercouch:gradle-download-task:5.0.1"
         classpath "com.diffplug.spotless:spotless-plugin-gradle:5.15.0"
     }
@@ -361,15 +361,15 @@ if (project == rootProject) {
     apply from: "spotless.gradle"
 }
 
-apply plugin: "com.android.library"
-apply plugin: "maven-publish"
-apply plugin: "de.undercouch.download"
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+apply plugin: 'de.undercouch.download'
 
 android {
-    compileSdkVersion safeExtGet("compileSdkVersion", 30)
+    compileSdkVersion 33
     defaultConfig {
-        minSdkVersion safeExtGet("minSdkVersion", 16)
-        targetSdkVersion safeExtGet("targetSdkVersion", 30)
+        minSdkVersion 24
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         externalNativeBuild {
@@ -650,20 +650,31 @@ task packageNdkLibs(type: Copy) {
 }
 
 repositories {
-    mavenCentral()
-    mavenLocal()
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url "$reactNative/android"
-    }
-    maven {
-        // Android JSC is installed from npm
-        url "$reactNative/../jsc-android/dist"
+    if (project == rootProject) {
+        maven { url "https://a8c-libs.s3.amazonaws.com/android/react-native-mirror" }
+    } else {
+        maven {
+            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+            url "$reactNative/android"
+        }
+        maven {
+            // Android JSC is installed from npm
+            url "$reactNative/../jsc-android/dist"
+        }
     }
+    mavenCentral()
     google()
 }
 
 dependencies {
+    //noinspection GradleDynamicVersion
+    if (project == rootProject) {
+        // If this is the root project (e.g. Jitpack), specify a version
+        implementation 'com.facebook.react:react-native:0.69.4'
+    } else {
+        //noinspection GradleDynamicVersion
+        api "com.facebook.react:react-native:+"
+    }
     // noinspection GradleDynamicVersion
     implementation "com.facebook.yoga:proguard-annotations:1.19.0"
     if (isDeveloperMode()) {
@@ -672,7 +683,6 @@ dependencies {
     else {
         implementation "com.facebook.fbjni:fbjni-java-only:" + FBJNI_VERSION
     }
-    implementation "com.facebook.react:react-native:+" // From node_modules
     implementation "androidx.transition:transition:1.1.0"
     extractHeaders("com.facebook.fbjni:fbjni:" + FBJNI_VERSION + ":headers")
     extractSO("com.facebook.fbjni:fbjni:" + FBJNI_VERSION)

android/gradle.properties

@@ -1,25 +1,7 @@
-# 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-8A --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
-
-# 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
+org.gradle.jvmargs=-Xmx1536m -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.parallel=true
+org.gradle.configureondemand=true
+org.gradle.caching=true
 
 android.useAndroidX=true
 android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

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