Skip to content
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
b1e3464
mark: start upgrade
kkafar Dec 18, 2024
f4121bd
Node deps in FE
kkafar Dec 18, 2024
3d52718
Code changes for FabricExample
kkafar Dec 18, 2024
393d686
Reinstall native iOS deps
kkafar Dec 18, 2024
c8c4635
TOREVERT: Remove dependency on gesture-handler and reanimated
kkafar Dec 18, 2024
e26d131
TOREVERT: use only single test in apps
kkafar Dec 18, 2024
428bc0a
TOREVERT: update podfiles after removal of GH and REA
kkafar Dec 18, 2024
7ce428a
Add AppDelegate.swift to project targets in FE
kkafar Dec 18, 2024
c1b9ac4
Add missing bridging header
kkafar Dec 18, 2024
92a6ee4
Merge branch 'main' into @kkafar/support-0.77
kkafar Dec 18, 2024
09af0d7
Update yarn lock once again
kkafar Dec 18, 2024
a8cd2b5
feat: Use `BaseReactPackage` instead of `TurboReactPackage` (#2546)
mrousavy Dec 18, 2024
7c89096
Bump RN in libarary to 0.77.0-rc.3
kkafar Dec 19, 2024
f968e05
Update view manager interfaces & delegates for Paper
kkafar Dec 19, 2024
ad13f41
Bump RNSAC to 5.0.0 in FE
kkafar Dec 19, 2024
381ae77
POSSIBLY TO REVERT: Remove patches for gesture handler 2.20.0
kkafar Dec 19, 2024
1bc4a9c
Update patch for react-native-safe-area-context
kkafar Dec 19, 2024
937c5e0
All Android + iOS non-appdelegate-related changes for Example
kkafar Dec 19, 2024
d8daf6c
Rest of iOS changes for Example
kkafar Dec 19, 2024
7ad8e06
Workaround for autolinking on older rncli versions
kkafar Dec 20, 2024
13905c1
Merge branch 'main' into @kkafar/support-0.77
kkafar Dec 30, 2024
6216502
Bump RN to rc.4
kkafar Dec 30, 2024
cf86e79
Bump RN to rc.6
kkafar Jan 8, 2025
2c690d4
Restore reanimated with a patch
kkafar Jan 9, 2025
6a31905
Restore gesture-handler (current main)
kkafar Jan 9, 2025
683905d
Restore App.tsx
kkafar Jan 9, 2025
48b0a89
Restore apps/tests/index.ts
kkafar Jan 9, 2025
b8d896c
Update locks in hope that yarn lets my CI run
kkafar Jan 9, 2025
6b608f7
Patch for reanimated
kkafar Jan 10, 2025
7753fd0
Final patch for reanimated
kkafar Jan 10, 2025
7259db1
Fix reanimated patch in FabricExample
kkafar Jan 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Example/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ ruby ">= 2.6.10"
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
gem 'xcodeproj', '< 1.26.0'
4 changes: 2 additions & 2 deletions Example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ buildscript {
minSdkVersion = 24
compileSdkVersion = 35
targetSdkVersion = 34
ndkVersion = "26.1.10909125"
kotlinVersion = "1.9.24"
ndkVersion = "27.1.12297006"
kotlinVersion = "2.0.21"
}
repositories {
google()
Expand Down
5 changes: 0 additions & 5 deletions Example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ target 'ScreensExample' do
:app_path => "#{Pod::Config.instance.installation_root}/.."
)

target 'ScreensExampleTests' do
inherit! :complete
# Pods for testing
end

post_install do |installer|
# https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
react_native_post_install(
Expand Down
7 changes: 7 additions & 0 deletions Example/metro.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/**
* Metro configuration
* https://reactnative.dev/docs/metro
*
* @type {import('@react-native/metro-config').MetroConfig}
*/

const { getDefaultConfig, mergeConfig } = require('@react-native/metro-config');

const fs = require('fs');
Expand Down
17 changes: 7 additions & 10 deletions Example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,9 @@
"jotai": "^2.9.0",
"nanoid": "^4.0.2",
"react": "18.3.1",
"react-native": "0.76.0",
"react-native-gesture-handler": "^2.20.0",
"react-native-reanimated": "^3.16.0",
"react-native": "0.77.0-rc.3",
"react-native-restart": "^0.0.27",
"react-native-safe-area-context": "4.10.5",
"react-native-safe-area-context": "5.0.0",
"react-native-screens": "link:../",
"react-native-vector-icons": "^8.0.0"
},
Expand All @@ -45,15 +43,14 @@
"@react-native-community/cli": "15.0.0-alpha.2",
"@react-native-community/cli-platform-android": "15.0.0-alpha.2",
"@react-native-community/cli-platform-ios": "15.0.0-alpha.2",
"@react-native/babel-preset": "0.76.0",
"@react-native/eslint-config": "0.76.0",
"@react-native/metro-config": "0.76.0",
"@react-native/typescript-config": "0.76.0",
"@types/jest": "^29.2.5",
"@react-native/babel-preset": "0.77.0-rc.3",
"@react-native/eslint-config": "0.77.0-rc.3",
"@react-native/metro-config": "0.77.0-rc.3",
"@react-native/typescript-config": "0.77.0-rc.3",
"@types/jest": "^29.5.13",
"@types/react": "^18.2.72",
"@types/react-native": "0.72.2",
"@types/react-test-renderer": "^18.0.0",
"babel-jest": "^29.6.3",
"detox": "^20.17.0",
"eslint": "^8.19.0",
"glob-to-regexp": "^0.4.1",
Expand Down
47 changes: 0 additions & 47 deletions Example/patches/react-native-gesture-handler+2.20.0.patch

This file was deleted.

30 changes: 0 additions & 30 deletions Example/patches/react-native-safe-area-context+4.10.5.patch

This file was deleted.

39 changes: 39 additions & 0 deletions Example/patches/react-native-safe-area-context+5.0.0.patch
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not required for Fabric, as these files are auto generated there.

Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
diff --git a/node_modules/react-native-safe-area-context/android/src/paper/java/com/facebook/react/viewmanagers/RNCSafeAreaProviderManagerDelegate.java b/node_modules/react-native-safe-area-context/android/src/paper/java/com/facebook/react/viewmanagers/RNCSafeAreaProviderManagerDelegate.java
index dd4ef6c..5043a0f 100644
--- a/node_modules/react-native-safe-area-context/android/src/paper/java/com/facebook/react/viewmanagers/RNCSafeAreaProviderManagerDelegate.java
+++ b/node_modules/react-native-safe-area-context/android/src/paper/java/com/facebook/react/viewmanagers/RNCSafeAreaProviderManagerDelegate.java
@@ -11,12 +11,13 @@ 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 RNCSafeAreaProviderManagerDelegate<
T extends View,
- U extends BaseViewManagerInterface<T> & RNCSafeAreaProviderManagerInterface<T>>
+ U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNCSafeAreaProviderManagerInterface<T>>
extends BaseViewManagerDelegate<T, U> {
public RNCSafeAreaProviderManagerDelegate(U viewManager) {
super(viewManager);
diff --git a/node_modules/react-native-safe-area-context/android/src/paper/java/com/facebook/react/viewmanagers/RNCSafeAreaViewManagerDelegate.java b/node_modules/react-native-safe-area-context/android/src/paper/java/com/facebook/react/viewmanagers/RNCSafeAreaViewManagerDelegate.java
index de1686c..2c077ce 100644
--- a/node_modules/react-native-safe-area-context/android/src/paper/java/com/facebook/react/viewmanagers/RNCSafeAreaViewManagerDelegate.java
+++ b/node_modules/react-native-safe-area-context/android/src/paper/java/com/facebook/react/viewmanagers/RNCSafeAreaViewManagerDelegate.java
@@ -12,11 +12,12 @@ package com.facebook.react.viewmanagers;
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.ReadableMap;
+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 RNCSafeAreaViewManagerDelegate<
- T extends View, U extends BaseViewManagerInterface<T> & RNCSafeAreaViewManagerInterface<T>>
+ T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNCSafeAreaViewManagerInterface<T>>
extends BaseViewManagerDelegate<T, U> {
public RNCSafeAreaViewManagerDelegate(U viewManager) {
super(viewManager);
Loading
Loading