Skip to content

Commit a9b5260

Browse files
authored
fix: support for react-native 0.65 (#443)
1 parent be1f63d commit a9b5260

5 files changed

Lines changed: 12 additions & 31 deletions

File tree

example/App.js

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,6 @@ const App = () => {
5252
backgroundColor: isDarkMode ? Colors.darker : Colors.lighter,
5353
};
5454

55-
const hermes = global.HermesInternal ? (
56-
<View style={styles.engine}>
57-
<Text
58-
style={[
59-
styles.footer,
60-
{
61-
color: isDarkMode ? Colors.light : Colors.dark,
62-
},
63-
]}
64-
>
65-
Engine: Hermes
66-
</Text>
67-
</View>
68-
) : null;
69-
7055
return (
7156
<SafeAreaView style={backgroundStyle}>
7257
<StatusBar barStyle={isDarkMode ? "light-content" : "dark-content"} />
@@ -75,7 +60,6 @@ const App = () => {
7560
style={backgroundStyle}
7661
>
7762
<Header />
78-
{hermes}
7963
<View
8064
style={{
8165
backgroundColor: isDarkMode ? Colors.black : Colors.white,
@@ -102,10 +86,6 @@ const App = () => {
10286
};
10387

10488
const styles = StyleSheet.create({
105-
engine: {
106-
position: "absolute",
107-
right: 0,
108-
},
10989
sectionContainer: {
11090
marginTop: 32,
11191
paddingHorizontal: 24,
@@ -122,13 +102,6 @@ const styles = StyleSheet.create({
122102
highlight: {
123103
fontWeight: "700",
124104
},
125-
footer: {
126-
fontSize: 12,
127-
fontWeight: "600",
128-
padding: 4,
129-
paddingRight: 12,
130-
textAlign: "right",
131-
},
132105
});
133106

134107
export default App;

example/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use_flipper!({
88
'Flipper-RSocket' => '1.3.1',
99
})
1010

11-
use_test_app! do |target|
11+
use_test_app! :hermes_enabled => false do |target|
1212
target.tests do
1313
pod 'Example-Tests', :path => '..'
1414
end

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
"@react-native-community/cli-platform-android": ">=4.10.0",
7373
"@react-native-community/cli-platform-ios": ">=4.10.0",
7474
"mustache": "^4.0.0",
75-
"react": "~16.8.6 || ~16.9.0 || ~16.11.0 || ~16.13.1 || ~17.0.1",
76-
"react-native": "^0.0.0-0 || ^0.60.6 || ^0.61.5 || ^0.62.2 || ^0.63.2 || ^0.64.0 || 1000.0.0",
75+
"react": "~16.8.6 || ~16.9.0 || ~16.11.0 || ~16.13.1 || ~17.0.1 || ~17.0.2",
76+
"react-native": "^0.0.0-0 || ^0.60.6 || ^0.61.5 || ^0.62.2 || ^0.63.2 || ^0.64.0 || ^0.65.0 || 1000.0.0",
7777
"react-native-macos": "^0.60.0 || ^0.61.0 || ^0.62.0 || ^0.63.0",
7878
"react-native-windows": "^0.62.0 || ^0.63.0 || ^0.64.0"
7979
},

scripts/set-react-version.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ const profiles = {
3838
"react-native-macos": undefined,
3939
"react-native-windows": "^0.64.11",
4040
},
41+
0.65: {
42+
"hermes-engine": "~0.8.1",
43+
react: "17.0.2",
44+
"react-native": "^0.65.0-0",
45+
"react-native-codegen": "0.0.7",
46+
"react-native-macos": undefined,
47+
"react-native-windows": undefined,
48+
},
4149
"canary-macos": {
4250
react: "16.13.1",
4351
"react-native": "^0.63.4",

test-app.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def cliAndroidDir = findNodeModulesPath(rootDir, "@react-native-community/cli-pl
3939
apply from: "$cliAndroidDir/native_modules.gradle"
4040

4141
ext.applyTestAppSettings = { DefaultSettings defaultSettings ->
42-
buildscript { scriptHandler ->
42+
buildscript { scriptHandler ->
4343
apply from: "$scriptDir/android/force-resolve-trove4j.gradle", to: scriptHandler
4444
}
4545

0 commit comments

Comments
 (0)