From 712405d8cd54a6f9c4869e9ac217c8551165e3b8 Mon Sep 17 00:00:00 2001 From: William Candillon Date: Mon, 28 Oct 2024 15:42:56 +0100 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=92=9A=20disable=20turbo=20cache=20(#?= =?UTF-8?q?2710)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 4 +- apps/paper/ios/Podfile.lock | 4 +- .../paper/ios/paper.xcodeproj/project.pbxproj | 106 +++++++++--------- apps/paper/package.json | 2 +- yarn.lock | 10 +- 5 files changed, 63 insertions(+), 63 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07c9038210..6d393aea7e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -142,7 +142,7 @@ jobs: env: JAVA_OPTS: "-XX:MaxHeapSize=6g" run: | - yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" --concurrency 1 --filter=paper + yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" --concurrency 1 --filter=paper --force build-android: runs-on: macos-latest-large @@ -331,4 +331,4 @@ jobs: - name: Build example for iOS run: | - yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" --concurrency 1 + yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" --concurrency 1 --force diff --git a/apps/paper/ios/Podfile.lock b/apps/paper/ios/Podfile.lock index 98c1b0091b..e0f5f4bbf0 100644 --- a/apps/paper/ios/Podfile.lock +++ b/apps/paper/ios/Podfile.lock @@ -1283,7 +1283,7 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - react-native-wgpu (0.1.7): + - react-native-wgpu (0.1.13): - DoubleConversion - glog - hermes-engine @@ -1937,7 +1937,7 @@ SPEC CHECKSUMS: react-native-safe-area-context: ab8f4a3d8180913bd78ae75dd599c94cce3d5e9a react-native-skia: 89e0ec26e70ca4f34a7a1f7425bc955baf77c566 react-native-slider: 97ce0bd921f40de79cead9754546d5e4e7ba44f8 - react-native-wgpu: fb9d60b0f4c63a03fb60bd986d758aeffca6ee13 + react-native-wgpu: c62fa0a17226a438d0fcd63b2177ce554e70f5b0 React-nativeconfig: 57781b79e11d5af7573e6f77cbf1143b71802a6d React-NativeModulesApple: 7ff2e2cfb2e5fa5bdedcecf28ce37e696c6ef1e1 React-perflogger: 8a360ccf603de6ddbe9ff8f54383146d26e6c936 diff --git a/apps/paper/ios/paper.xcodeproj/project.pbxproj b/apps/paper/ios/paper.xcodeproj/project.pbxproj index 6254aebdfd..ea31a8a210 100644 --- a/apps/paper/ios/paper.xcodeproj/project.pbxproj +++ b/apps/paper/ios/paper.xcodeproj/project.pbxproj @@ -8,13 +8,13 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* paperTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* paperTests.m */; }; - 12943193CE6A8655FAFA9DEF /* libPods-paper-paperTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 862E492DB64E77AD62D1833C /* libPods-paper-paperTests.a */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 5A5573D48597F250071C3631 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = C4E88CA904DA354414CAB50C /* PrivacyInfo.xcprivacy */; }; + 7FEC58A8FD2A3EDFB5750E2C /* libPods-paper-paperTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E9B7928C62E960FC3CAE89C1 /* libPods-paper-paperTests.a */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; - F35CA691D5509BDF66EB492E /* libPods-paper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AD80514BC8109358191BCFA5 /* libPods-paper.a */; }; + ED38CE2BF27068459A24ECF7 /* libPods-paper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C64031E821E865DDC6458BA /* libPods-paper.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -38,14 +38,14 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = paper/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = paper/main.m; sourceTree = ""; }; 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = paper/PrivacyInfo.xcprivacy; sourceTree = ""; }; - 13BB0924D9C730D84AB31536 /* Pods-paper.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-paper.release.xcconfig"; path = "Target Support Files/Pods-paper/Pods-paper.release.xcconfig"; sourceTree = ""; }; - 4B597544FF69440CCC1C3FB3 /* Pods-paper-paperTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-paper-paperTests.debug.xcconfig"; path = "Target Support Files/Pods-paper-paperTests/Pods-paper-paperTests.debug.xcconfig"; sourceTree = ""; }; + 2B0BB7705762AB0CCCFA5CDC /* Pods-paper.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-paper.release.xcconfig"; path = "Target Support Files/Pods-paper/Pods-paper.release.xcconfig"; sourceTree = ""; }; + 3488FD118FCD4EB338114AAA /* Pods-paper-paperTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-paper-paperTests.debug.xcconfig"; path = "Target Support Files/Pods-paper-paperTests/Pods-paper-paperTests.debug.xcconfig"; sourceTree = ""; }; + 4C64031E821E865DDC6458BA /* libPods-paper.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-paper.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = paper/LaunchScreen.storyboard; sourceTree = ""; }; - 862E492DB64E77AD62D1833C /* libPods-paper-paperTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-paper-paperTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 8EA754FA2EFE603D68B739B1 /* Pods-paper.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-paper.debug.xcconfig"; path = "Target Support Files/Pods-paper/Pods-paper.debug.xcconfig"; sourceTree = ""; }; - A75872F68B82029302893F64 /* Pods-paper-paperTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-paper-paperTests.release.xcconfig"; path = "Target Support Files/Pods-paper-paperTests/Pods-paper-paperTests.release.xcconfig"; sourceTree = ""; }; - AD80514BC8109358191BCFA5 /* libPods-paper.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-paper.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 852870306A24801FBCD463D2 /* Pods-paper-paperTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-paper-paperTests.release.xcconfig"; path = "Target Support Files/Pods-paper-paperTests/Pods-paper-paperTests.release.xcconfig"; sourceTree = ""; }; + 9DF30D641329E20B50BBFA4E /* Pods-paper.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-paper.debug.xcconfig"; path = "Target Support Files/Pods-paper/Pods-paper.debug.xcconfig"; sourceTree = ""; }; C4E88CA904DA354414CAB50C /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = paper/PrivacyInfo.xcprivacy; sourceTree = ""; }; + E9B7928C62E960FC3CAE89C1 /* libPods-paper-paperTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-paper-paperTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -54,7 +54,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 12943193CE6A8655FAFA9DEF /* libPods-paper-paperTests.a in Frameworks */, + 7FEC58A8FD2A3EDFB5750E2C /* libPods-paper-paperTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -62,7 +62,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F35CA691D5509BDF66EB492E /* libPods-paper.a in Frameworks */, + ED38CE2BF27068459A24ECF7 /* libPods-paper.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -105,8 +105,8 @@ isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - AD80514BC8109358191BCFA5 /* libPods-paper.a */, - 862E492DB64E77AD62D1833C /* libPods-paper-paperTests.a */, + 4C64031E821E865DDC6458BA /* libPods-paper.a */, + E9B7928C62E960FC3CAE89C1 /* libPods-paper-paperTests.a */, ); name = Frameworks; sourceTree = ""; @@ -145,10 +145,10 @@ BBD78D7AC51CEA395F1C20DB /* Pods */ = { isa = PBXGroup; children = ( - 8EA754FA2EFE603D68B739B1 /* Pods-paper.debug.xcconfig */, - 13BB0924D9C730D84AB31536 /* Pods-paper.release.xcconfig */, - 4B597544FF69440CCC1C3FB3 /* Pods-paper-paperTests.debug.xcconfig */, - A75872F68B82029302893F64 /* Pods-paper-paperTests.release.xcconfig */, + 9DF30D641329E20B50BBFA4E /* Pods-paper.debug.xcconfig */, + 2B0BB7705762AB0CCCFA5CDC /* Pods-paper.release.xcconfig */, + 3488FD118FCD4EB338114AAA /* Pods-paper-paperTests.debug.xcconfig */, + 852870306A24801FBCD463D2 /* Pods-paper-paperTests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -160,12 +160,12 @@ isa = PBXNativeTarget; buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "paperTests" */; buildPhases = ( - 46623BA60E005FA6F354B620 /* [CP] Check Pods Manifest.lock */, + 4F79718F1BEE1F6FE3619B51 /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, - 61923316DFE79DF774641BA6 /* [CP] Embed Pods Frameworks */, - 47BAD351472295DC31D0DB7A /* [CP] Copy Pods Resources */, + 5720DCE66AA6CBC01508F8A5 /* [CP] Embed Pods Frameworks */, + 57BD29C564BCC30858545D68 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -181,13 +181,13 @@ isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "paper" */; buildPhases = ( - F73E8970BA9EA30ACCA0905E /* [CP] Check Pods Manifest.lock */, + 3F7BE6E00CB025D3580B5F67 /* [CP] Check Pods Manifest.lock */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, - B33D55632B01A96381DCE908 /* [CP] Embed Pods Frameworks */, - 218855078D48FF1C97A4907A /* [CP] Copy Pods Resources */, + 64B7EEAB0D36F7B8420933FE /* [CP] Embed Pods Frameworks */, + DD6A5382C464C81023CC20D0 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -271,24 +271,29 @@ shellPath = /bin/sh; shellScript = "set -e\n\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n"; }; - 218855078D48FF1C97A4907A /* [CP] Copy Pods Resources */ = { + 3F7BE6E00CB025D3580B5F67 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-paper/Pods-paper-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Copy Pods Resources"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-paper/Pods-paper-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-paper-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-paper/Pods-paper-resources.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 46623BA60E005FA6F354B620 /* [CP] Check Pods Manifest.lock */ = { + 4F79718F1BEE1F6FE3619B51 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -310,41 +315,41 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 47BAD351472295DC31D0DB7A /* [CP] Copy Pods Resources */ = { + 5720DCE66AA6CBC01508F8A5 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-paper-paperTests/Pods-paper-paperTests-resources-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-paper-paperTests/Pods-paper-paperTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Copy Pods Resources"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-paper-paperTests/Pods-paper-paperTests-resources-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-paper-paperTests/Pods-paper-paperTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-paper-paperTests/Pods-paper-paperTests-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-paper-paperTests/Pods-paper-paperTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 61923316DFE79DF774641BA6 /* [CP] Embed Pods Frameworks */ = { + 57BD29C564BCC30858545D68 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-paper-paperTests/Pods-paper-paperTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-paper-paperTests/Pods-paper-paperTests-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-paper-paperTests/Pods-paper-paperTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-paper-paperTests/Pods-paper-paperTests-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-paper-paperTests/Pods-paper-paperTests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-paper-paperTests/Pods-paper-paperTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - B33D55632B01A96381DCE908 /* [CP] Embed Pods Frameworks */ = { + 64B7EEAB0D36F7B8420933FE /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -361,26 +366,21 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-paper/Pods-paper-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - F73E8970BA9EA30ACCA0905E /* [CP] Check Pods Manifest.lock */ = { + DD6A5382C464C81023CC20D0 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-paper/Pods-paper-resources-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-paper-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-paper/Pods-paper-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-paper/Pods-paper-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -416,7 +416,7 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4B597544FF69440CCC1C3FB3 /* Pods-paper-paperTests.debug.xcconfig */; + baseConfigurationReference = 3488FD118FCD4EB338114AAA /* Pods-paper-paperTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -443,7 +443,7 @@ }; 00E356F71AD99517003FC87E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A75872F68B82029302893F64 /* Pods-paper-paperTests.release.xcconfig */; + baseConfigurationReference = 852870306A24801FBCD463D2 /* Pods-paper-paperTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; @@ -467,7 +467,7 @@ }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8EA754FA2EFE603D68B739B1 /* Pods-paper.debug.xcconfig */; + baseConfigurationReference = 9DF30D641329E20B50BBFA4E /* Pods-paper.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -494,7 +494,7 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 13BB0924D9C730D84AB31536 /* Pods-paper.release.xcconfig */; + baseConfigurationReference = 2B0BB7705762AB0CCCFA5CDC /* Pods-paper.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; diff --git a/apps/paper/package.json b/apps/paper/package.json index d1424ccb2b..2c61dcd47c 100644 --- a/apps/paper/package.json +++ b/apps/paper/package.json @@ -32,7 +32,7 @@ "react-native-safe-area-context": "^4.10.9", "react-native-screens": "^3.34.0", "react-native-svg": "^15.6.0", - "react-native-wgpu": "^0.1.7", + "react-native-wgpu": "https://firebasestorage.googleapis.com/v0/b/start-react-native.appspot.com/o/tmp%2Fpackage.tgz?alt=media&token=c27867d2-d46e-407d-8c32-073bbd29c4dd", "typescript": "^5.2.2" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 40b7b94d98..579fbc283d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15399,7 +15399,7 @@ __metadata: react-native-safe-area-context: ^4.10.9 react-native-screens: ^3.34.0 react-native-svg: ^15.6.0 - react-native-wgpu: ^0.1.7 + react-native-wgpu: "https://firebasestorage.googleapis.com/v0/b/start-react-native.appspot.com/o/tmp%2Fpackage.tgz?alt=media&token=c27867d2-d46e-407d-8c32-073bbd29c4dd" react-test-renderer: 18.3.1 typescript: ^5.2.2 languageName: unknown @@ -16920,13 +16920,13 @@ __metadata: languageName: node linkType: hard -"react-native-wgpu@npm:^0.1.7": - version: 0.1.7 - resolution: "react-native-wgpu@npm:0.1.7" +"react-native-wgpu@https://firebasestorage.googleapis.com/v0/b/start-react-native.appspot.com/o/tmp%2Fpackage.tgz?alt=media&token=c27867d2-d46e-407d-8c32-073bbd29c4dd": + version: 0.1.13 + resolution: "react-native-wgpu@https://firebasestorage.googleapis.com/v0/b/start-react-native.appspot.com/o/tmp%2Fpackage.tgz?alt=media&token=c27867d2-d46e-407d-8c32-073bbd29c4dd" peerDependencies: react: "*" react-native: "*" - checksum: cbd0e0fa6fc859ceb4686cb1baeb804686c561ff7d9083b58a4e0c7037766e797d92f5fe895a9716c3ce5f8540033b5c5073ce64a85cd3aefae584d33ac7b47c + checksum: ea7097ba2a5a7b323b063c20d67129c846893017df2443319ca279514161fa1fd8def6eaf19a533962f1becf0d5f0bbd9851fc505f19a7a43bb51e26c3a225ee languageName: node linkType: hard From 5095c445065af05844f7bad01698f88da071c18c Mon Sep 17 00:00:00 2001 From: Samuel Scheit Date: Mon, 28 Oct 2024 16:25:54 +0000 Subject: [PATCH 2/4] =?UTF-8?q?fix(=F0=9F=8D=8F):=20support=20for=20ProMot?= =?UTF-8?q?ion=20120hz=20(#2690)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: canvas not rendering with 120 fps * Update DisplayLink.mm * Update DisplayLink.mm --------- Co-authored-by: William Candillon --- packages/skia/ios/RNSkia-iOS/DisplayLink.mm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/skia/ios/RNSkia-iOS/DisplayLink.mm b/packages/skia/ios/RNSkia-iOS/DisplayLink.mm index b30677ae66..b57686941b 100644 --- a/packages/skia/ios/RNSkia-iOS/DisplayLink.mm +++ b/packages/skia/ios/RNSkia-iOS/DisplayLink.mm @@ -10,6 +10,13 @@ - (void)start:(block_t)block { _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(update:)]; + if (@available(iOS 15.0, *)) { + CAFrameRateRange rate = CAFrameRateRangeMake(60, 120, 120); + _displayLink.preferredFrameRateRange = rate; + } else { + _displayLink.preferredFramesPerSecond = 60; + } + // add the display link to the main run loop [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes]; From b5917144e3ee5e1ae9de0fb66f8492295ba3c95a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 17:53:26 +0100 Subject: [PATCH 3/4] chore(deps): bump http-proxy-middleware (#2712) Bumps the npm_and_yarn group with 1 update in the / directory: [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware). Updates `http-proxy-middleware` from 2.0.6 to 2.0.7 - [Release notes](https://github.com/chimurai/http-proxy-middleware/releases) - [Changelog](https://github.com/chimurai/http-proxy-middleware/blob/v2.0.7/CHANGELOG.md) - [Commits](https://github.com/chimurai/http-proxy-middleware/compare/v2.0.6...v2.0.7) --- updated-dependencies: - dependency-name: http-proxy-middleware dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: William Candillon --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 579fbc283d..9437f51ce0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11234,8 +11234,8 @@ __metadata: linkType: hard "http-proxy-middleware@npm:^2.0.3": - version: 2.0.6 - resolution: "http-proxy-middleware@npm:2.0.6" + version: 2.0.7 + resolution: "http-proxy-middleware@npm:2.0.7" dependencies: "@types/http-proxy": ^1.17.8 http-proxy: ^1.18.1 @@ -11247,7 +11247,7 @@ __metadata: peerDependenciesMeta: "@types/express": optional: true - checksum: 2ee85bc878afa6cbf34491e972ece0f5be0a3e5c98a60850cf40d2a9a5356e1fc57aab6cff33c1fc37691b0121c3a42602d2b1956c52577e87a5b77b62ae1c3a + checksum: 18caa21145917aa1054740353916e8f03f5a3a93bede9106f1f44d84f7b174df17af1c72bf5fade5cc440c2058ee813f47cbb2bdd6ae6874af1cf33e0ac575f3 languageName: node linkType: hard From 25476d43d21009cb28eb353be9200a619dd5eba5 Mon Sep 17 00:00:00 2001 From: William Candillon Date: Tue, 29 Oct 2024 13:30:33 +0100 Subject: [PATCH 4/4] Remove --cache-dir option in turbomodules (#2713) --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d393aea7e..00341cdb10 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -142,7 +142,7 @@ jobs: env: JAVA_OPTS: "-XX:MaxHeapSize=6g" run: | - yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" --concurrency 1 --filter=paper --force + yarn turbo run build:android --concurrency 1 --filter=paper --force build-android: runs-on: macos-latest-large @@ -206,7 +206,7 @@ jobs: env: JAVA_OPTS: "-XX:MaxHeapSize=6g" run: | - yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" --concurrency 1 + yarn turbo run build:android --concurrency 1 --force - name: Cache apk uses: actions/cache/save@v3 @@ -331,4 +331,4 @@ jobs: - name: Build example for iOS run: | - yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" --concurrency 1 --force + yarn turbo run build:ios --concurrency 1 --force