diff --git a/.ccache/ccache.conf b/.ccache/ccache.conf index dc0898d7aa..39f72de693 100644 --- a/.ccache/ccache.conf +++ b/.ccache/ccache.conf @@ -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 diff --git a/.github/actions/setup-toolchain/action.yml b/.github/actions/setup-toolchain/action.yml index 6a5952fa82..9f2ddb2c01 100644 --- a/.github/actions/setup-toolchain/action.yml +++ b/.github/actions/setup-toolchain/action.yml @@ -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 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc41a2f982..9f27553e68 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index ae04661ee7..f72df95a7e 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/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.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/example/ios/ExampleTests/ManifestTests.swift b/example/ios/ExampleTests/ManifestTests.swift index 85855f1ec4..e165c199e8 100644 --- a/example/ios/ExampleTests/ManifestTests.swift +++ b/example/ios/ExampleTests/ManifestTests.swift @@ -188,3 +188,5 @@ class ManifestTests: XCTestCase { XCTAssertNotNil(object["object"] as? NSNull) } } + +// swiftlint:enable force_cast diff --git a/example/package.json b/example/package.json index 9c2e1aa686..abe7681563 100644 --- a/example/package.json +++ b/example/package.json @@ -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" }, diff --git a/package.json b/package.json index 0d024f2fe2..eb87a5d313 100644 --- a/package.json +++ b/package.json @@ -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" }, diff --git a/scripts/android-nightly.patch b/scripts/android-nightly.patch index 223292f3be..b3dfedb69c 100644 --- a/scripts/android-nightly.patch +++ b/scripts/android-nightly.patch @@ -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 ( -- - - - { - - - -- - ); - }; - diff --git a/example/package.json b/example/package.json index 9c2e1aa..94fb85e 100644 --- a/example/package.json diff --git a/scripts/disable-safe-area-context.patch b/scripts/disable-safe-area-context.patch new file mode 100644 index 0000000000..2403be5ceb --- /dev/null +++ b/scripts/disable-safe-area-context.patch @@ -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 ( +- + + + { + + + +- + ); + }; + diff --git a/scripts/test-matrix.sh b/scripts/test-matrix.sh index 4cbbc625ba..8725cb2d03 100755 --- a/scripts/test-matrix.sh +++ b/scripts/test-matrix.sh @@ -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 @@ -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 diff --git a/yarn.lock b/yarn.lock index e1d1e0bbad..d6e57c5803 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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 @@ -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: