Skip to content

Commit

Permalink
Update the generated specs for the old architecture to work on 0.77 (#…
Browse files Browse the repository at this point in the history
…3301)

## Description


#3278
and
#3277
added support for RN 0.77 where the result of generated java files has
changed but those weren't updated in the PRs. This should've been caught
by the CI but the `package.json` files weren't listed as paths that
would trigger it. This seems wrong, as I would imagine we would like the
CI to run when changing dependencies, especially React Native.

## Test plan

Build the example app (0.75 old arch) and Fabric example app (0.77, both
old and new arch)
  • Loading branch information
j-piasecki authored Dec 20, 2024
1 parent d6f877e commit 2a4bad7
Show file tree
Hide file tree
Showing 5 changed files with 723 additions and 1,426 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/check-archs-consistency.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ on:
- main
paths:
- src/specs/**
- android/paper/**
- package.json
- FabricExample/package.json
- .github/workflows/check-archs-consistency.yml
push:
branches:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.ColorPropConverter;
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 RNGestureHandlerButtonManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNGestureHandlerButtonManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
public class RNGestureHandlerButtonManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNGestureHandlerButtonManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
public RNGestureHandlerButtonManagerDelegate(U viewManager) {
super(viewManager);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@

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 RNGestureHandlerRootViewManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNGestureHandlerRootViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
public class RNGestureHandlerRootViewManagerDelegate<T extends View, U extends BaseViewManager<T, ? extends LayoutShadowNode> & RNGestureHandlerRootViewManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
public RNGestureHandlerRootViewManagerDelegate(U viewManager) {
super(viewManager);
}
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@
"invariant": "^2.2.4"
},
"devDependencies": {
"@babel/core": "^7.12.9",
"@babel/preset-env": "^7.12.11",
"@babel/core": "^7.25.2",
"@babel/preset-env": "^7.25.3",
"@babel/preset-typescript": "^7.12.7",
"@react-native/babel-preset": "^0.74.85",
"@react-native/babel-preset": "0.77.0-rc.3",
"@testing-library/react-native": "^12.5.1",
"@types/hoist-non-react-statics": "^3.3.1",
"@types/invariant": "^2.2.37",
Expand All @@ -94,8 +94,8 @@
"lint-staged": "^12.3.2",
"madge": "^6.1.0",
"prettier": "3.3.3",
"react": "18.2.0",
"react-native": "0.74.3",
"react": "18.3.1",
"react-native": "0.77.0-rc.3",
"react-native-builder-bob": "^0.17.1",
"react-native-reanimated": "^3.12.0",
"react-test-renderer": "18.2.0",
Expand Down
Loading

0 comments on commit 2a4bad7

Please sign in to comment.