Skip to content

Commit

Permalink
fix: declare support for react-native 0.72
Browse files Browse the repository at this point in the history
  • Loading branch information
tido64 committed Apr 13, 2023
1 parent c41505c commit 025dc3c
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 44 deletions.
1 change: 1 addition & 0 deletions .ccache/ccache.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
depend_mode = true
direct_mode = true
hard_link = true
max_size = 1G
run_second_cpp = true
sloppiness = file_stat_matches,include_file_ctime,include_file_mtime,ivfsoverlay,modules,system_headers,time_macros
3 changes: 1 addition & 2 deletions .github/actions/setup-toolchain/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,4 @@ runs:
uses: actions/cache@v3
with:
path: .ccache
key: ${{ runner.os }}-${{ inputs.cache-key-prefix }}-ccache-${{ steps.setup-ccache.outputs.cache-key }}
restore-keys: ${{ runner.os }}-${{ inputs.cache-key-prefix }}-ccache-
key: ${{ runner.os }}-${{ inputs.cache-key-prefix }}-ccache-${{ steps.setup-ccache.outputs.cache-key }}-1
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ jobs:
- name: Set up react-native@nightly
if: ${{ github.event_name == 'schedule' }}
run: |
git apply scripts/disable-safe-area-context.patch
git apply scripts/android-nightly.patch
npm run set-react-version -- nightly
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 2 additions & 0 deletions example/ios/ExampleTests/ManifestTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -188,3 +188,5 @@ class ManifestTests: XCTestCase {
XCTAssertNotNil(object["object"] as? NSNull)
}
}

// swiftlint:enable force_cast
2 changes: 1 addition & 1 deletion example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"peerDependencies": {
"react": "~17.0.1 || ~18.0.0 || ~18.1.0 || ~18.2.0",
"react-native": "^0.0.0-0 || 0.64 - 0.71 || 1000.0.0",
"react-native": "^0.0.0-0 || 0.64 - 0.72 || 1000.0.0",
"react-native-macos": "^0.0.0-0 || 0.64 || 0.66 || 0.68 || 0.71",
"react-native-windows": "^0.0.0-0 || 0.64 - 0.71"
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"@react-native-community/cli-platform-ios": ">=5.0",
"mustache": "^4.0.0",
"react": "~17.0.1 || ~18.0.0 || ~18.1.0 || ~18.2.0",
"react-native": "^0.0.0-0 || 0.64 - 0.71 || 1000.0.0",
"react-native": "^0.0.0-0 || 0.64 - 0.72 || 1000.0.0",
"react-native-macos": "^0.0.0-0 || 0.64 || 0.66 || 0.68 || 0.71",
"react-native-windows": "^0.0.0-0 || 0.64 - 0.71"
},
Expand Down
36 changes: 0 additions & 36 deletions scripts/android-nightly.patch
Original file line number Diff line number Diff line change
@@ -1,39 +1,3 @@
diff --git a/example/App.js b/example/App.js
index c9cd14d..f63758d 100644
--- a/example/App.js
+++ b/example/App.js
@@ -2,6 +2,7 @@
import React, { useCallback, useMemo, useState } from "react";
import {
NativeModules,
+ SafeAreaView,
ScrollView,
StatusBar,
StyleSheet,
@@ -10,7 +11,6 @@ import {
useColorScheme,
View,
} from "react-native";
-import { SafeAreaProvider, SafeAreaView } from "react-native-safe-area-context";
// @ts-expect-error
import { version as coreVersion } from "react-native/Libraries/Core/ReactNativeVersion";
import { Colors, Header } from "react-native/Libraries/NewAppScreen";
@@ -169,7 +169,6 @@ const App = ({ concurrentRoot }) => {
);

return (
- <SafeAreaProvider>
<SafeAreaView style={styles.body}>
<StatusBar barStyle={isDarkMode ? "light-content" : "dark-content"} />
<ScrollView
@@ -192,7 +191,6 @@ const App = ({ concurrentRoot }) => {
</View>
</ScrollView>
</SafeAreaView>
- </SafeAreaProvider>
);
};

diff --git a/example/package.json b/example/package.json
index 9c2e1aa..94fb85e 100644
--- a/example/package.json
Expand Down
36 changes: 36 additions & 0 deletions scripts/disable-safe-area-context.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
diff --git a/example/App.js b/example/App.js
index c9cd14d..f63758d 100644
--- a/example/App.js
+++ b/example/App.js
@@ -2,6 +2,7 @@
import React, { useCallback, useMemo, useState } from "react";
import {
NativeModules,
+ SafeAreaView,
ScrollView,
StatusBar,
StyleSheet,
@@ -10,7 +11,6 @@ import {
useColorScheme,
View,
} from "react-native";
-import { SafeAreaProvider, SafeAreaView } from "react-native-safe-area-context";
// @ts-expect-error
import { version as coreVersion } from "react-native/Libraries/Core/ReactNativeVersion";
import { Colors, Header } from "react-native/Libraries/NewAppScreen";
@@ -169,7 +169,6 @@ const App = ({ concurrentRoot }) => {
);

return (
- <SafeAreaProvider>
<SafeAreaView style={styles.body}>
<StatusBar barStyle={isDarkMode ? "light-content" : "dark-content"} />
<ScrollView
@@ -192,7 +191,6 @@ const App = ({ concurrentRoot }) => {
</View>
</ScrollView>
</SafeAreaView>
- </SafeAreaProvider>
);
};

3 changes: 2 additions & 1 deletion scripts/test-matrix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ echo
popd 1> /dev/null
prepare
# `react-native-safe-area-context` doesn't support latest New Arch changes
git apply scripts/disable-safe-area-context.patch
sed -i '' 's/"react-native-safe-area-context": ".[.0-9]*",//' package.json

echo
Expand Down Expand Up @@ -137,4 +138,4 @@ echo "│ Initialize new app │"
echo "└─────────────────────┘"
echo

yarn react-native init-test-app --destination template-example --name TemplateExample --platform android,ios
GIT_IGNORE_FILE=".gitignore" yarn react-native init-test-app --destination template-example --name TemplateExample --platform android,ios
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5487,7 +5487,7 @@ __metadata:
react-native-windows: ^0.71.4
peerDependencies:
react: ~17.0.1 || ~18.0.0 || ~18.1.0 || ~18.2.0
react-native: ^0.0.0-0 || 0.64 - 0.71 || 1000.0.0
react-native: ^0.0.0-0 || 0.64 - 0.72 || 1000.0.0
react-native-macos: ^0.0.0-0 || 0.64 || 0.66 || 0.68 || 0.71
react-native-windows: ^0.0.0-0 || 0.64 - 0.71
languageName: unknown
Expand Down Expand Up @@ -10057,7 +10057,7 @@ fsevents@^2.3.2:
"@react-native-community/cli-platform-ios": ">=5.0"
mustache: ^4.0.0
react: ~17.0.1 || ~18.0.0 || ~18.1.0 || ~18.2.0
react-native: ^0.0.0-0 || 0.64 - 0.71 || 1000.0.0
react-native: ^0.0.0-0 || 0.64 - 0.72 || 1000.0.0
react-native-macos: ^0.0.0-0 || 0.64 || 0.66 || 0.68 || 0.71
react-native-windows: ^0.0.0-0 || 0.64 - 0.71
peerDependenciesMeta:
Expand Down

0 comments on commit 025dc3c

Please sign in to comment.