Skip to content

Commit

Permalink
[menu-bar] Upgrade react-native to 0.75.2 (#203)
Browse files Browse the repository at this point in the history 
* [menu-bar] Upgrade react-native to 0.75.2

* [menu-bar] Patch expo-modules-core and expo-font

* [menu-bar] Disable hermes

* Add changelog entry
  • Loading branch information
@gabrieldonadel
gabrieldonadel authored Sep 2, 2024
1 parent a7054c1 commit 25c6971
Show file tree
Hide file tree
Showing 10 changed files with 2,307 additions and 1,971 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

- Update devices order to show physical devices first. ([#197](https://github.com/expo/orbit/pull/197) by [@gabrieldonadel](https://github.com/gabrieldonadel))
- Improve listing connected Apple devices over Wi-Fi. ([#199](https://github.com/expo/orbit/pull/199) by [@gabrieldonadel](https://github.com/gabrieldonadel))
- Upgrade `react-native` to 0.75.2. ([#203](https://github.com/expo/orbit/pull/203) by [@gabrieldonadel](https://github.com/gabrieldonadel))

## 1.1.1 — 2024-03-15

Expand Down
47 changes: 31 additions & 16 deletions apps/menu-bar/macos/ExpoMenuBar.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@

/* Begin PBXBuildFile section */
045175BE45C09A78501F3277 /* libPods-ExpoMenuBar-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D5B57287467FCE0C3AD2F77 /* libPods-ExpoMenuBar-macOS.a */; };
1E86C311712A1366282D4A28 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 6DF0AD98E1DDDB5E7C991DB8 /* PrivacyInfo.xcprivacy */; };
5142014D2437B4B30078DB4F /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 5142014C2437B4B30078DB4F /* AppDelegate.m */; };
514201522437B4B40078DB4F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 514201512437B4B40078DB4F /* Assets.xcassets */; };
514201552437B4B40078DB4F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 514201532437B4B40078DB4F /* Main.storyboard */; };
514201582437B4B40078DB4F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 514201572437B4B40078DB4F /* main.m */; };
77818F2A6E488E8B68D317B2 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B02E22FAC6ED05060D31BB51 /* ExpoModulesProvider.swift */; };
A961E5EFDD85D2BD61A876CD /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 8C8623B49FAF0AE99A5F7711 /* PrivacyInfo.xcprivacy */; };
C032EDB72A1FE6F300FBC597 /* orbit-cli-arm64 in Resources */ = {isa = PBXBuildFile; fileRef = C032EDB62A1FE6F300FBC597 /* orbit-cli-arm64 */; };
C051E6B62A83577800C6D615 /* orbit-cli-x64 in Resources */ = {isa = PBXBuildFile; fileRef = C051E6B52A83577800C6D615 /* orbit-cli-x64 */; };
C051EC0E2AA227C600C6D615 /* SwifterWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C051EC0D2AA227C600C6D615 /* SwifterWrapper.swift */; };
Expand Down Expand Up @@ -62,6 +64,8 @@
514201562437B4B40078DB4F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
514201572437B4B40078DB4F /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
514201592437B4B40078DB4F /* ExpoMenuBar.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ExpoMenuBar.entitlements; sourceTree = "<group>"; };
6DF0AD98E1DDDB5E7C991DB8 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = ../PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
8C8623B49FAF0AE99A5F7711 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = ../PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
9D32DFD059D5DB6DDEF38881 /* Pods-Shared-ExpoMenuBar-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Shared-ExpoMenuBar-iOS.debug.xcconfig"; path = "Target Support Files/Pods-Shared-ExpoMenuBar-iOS/Pods-Shared-ExpoMenuBar-iOS.debug.xcconfig"; sourceTree = "<group>"; };
A82DFB63B157C65E5D698CA2 /* Pods-Shared-ExpoMenuBar-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Shared-ExpoMenuBar-iOS.release.xcconfig"; path = "Target Support Files/Pods-Shared-ExpoMenuBar-iOS/Pods-Shared-ExpoMenuBar-iOS.release.xcconfig"; sourceTree = "<group>"; };
B02E22FAC6ED05060D31BB51 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-ExpoMenuBar-macOS/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -201,6 +205,7 @@
C06B8F8E2AAA906A009F2BB5 /* FileHandlerManager.h */,
C06B8F8F2AAB77D0009F2BB5 /* DragDropStatusItemView.m */,
C06B8F912AAB77EC009F2BB5 /* DragDropStatusItemView.h */,
6DF0AD98E1DDDB5E7C991DB8 /* PrivacyInfo.xcprivacy */,
);
path = "ExpoMenuBar-macOS";
sourceTree = "<group>";
Expand Down Expand Up @@ -260,6 +265,7 @@
C08E65202A5C411D0079E3A9 /* AppDelegate.swift */,
C08E65292A5C411E0079E3A9 /* AutoLauncher.entitlements */,
C08E652D2A5C42950079E3A9 /* main.swift */,
8C8623B49FAF0AE99A5F7711 /* PrivacyInfo.xcprivacy */,
);
path = AutoLauncher;
sourceTree = "<group>";
Expand Down Expand Up @@ -356,13 +362,15 @@
C081507F2A610E9C00E8890F /* fonts in Resources */,
514201522437B4B40078DB4F /* Assets.xcassets in Resources */,
514201552437B4B40078DB4F /* Main.storyboard in Resources */,
1E86C311712A1366282D4A28 /* PrivacyInfo.xcprivacy in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
C08E651C2A5C411D0079E3A9 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
A961E5EFDD85D2BD61A876CD /* PrivacyInfo.xcprivacy in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -547,8 +555,11 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
OTHER_CFLAGS = "$(inherited) ";
MACOSX_DEPLOYMENT_TARGET = 11.0;
OTHER_CFLAGS = (
"$(inherited)",
" ",
);
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -585,8 +596,11 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
OTHER_CFLAGS = "$(inherited) ";
MACOSX_DEPLOYMENT_TARGET = 11.0;
OTHER_CFLAGS = (
"$(inherited)",
" ",
);
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -606,6 +620,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CC = "";
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
CLANG_CXX_LIBRARY = "libc++";
Expand All @@ -632,6 +647,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CXX = "";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
Expand All @@ -651,6 +667,8 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LD = "";
LDPLUSPLUS = "";
LD_RUNPATH_SEARCH_PATHS = (
/usr/lib/swift,
"$(inherited)",
Expand All @@ -664,21 +682,19 @@
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "$(inherited)";
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native-macos";
SDKROOT = macosx;
USE_HERMES = true;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
USE_HERMES = false;
};
name = Debug;
};
83CBBA211A601CBA00E9B192 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CC = "";
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
CLANG_CXX_LIBRARY = "libc++";
Expand All @@ -705,6 +721,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
CXX = "";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
Expand All @@ -720,6 +737,8 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LD = "";
LDPLUSPLUS = "";
LD_RUNPATH_SEARCH_PATHS = (
/usr/lib/swift,
"$(inherited)",
Expand All @@ -732,14 +751,10 @@
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = "$(inherited)";
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native-macos";
SDKROOT = macosx;
USE_HERMES = true;
USE_HERMES = false;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand Down
19 changes: 7 additions & 12 deletions apps/menu-bar/macos/Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,27 @@ showDevWindow = podfile_properties['showDevWindow'] == 'true'
showDockIcon = podfile_properties['showDockIcon'] == 'true'
other_cflags = "$(inherited) "+ (showDevWindow ? " -D"+"SHOW_DEV_WINDOW" : "") + (showDockIcon ? " -D"+"SHOW_DOCK_ICON" : "")

rn_macos_path = File.dirname(`node --print "require.resolve('react-native-macos/package.json')"`)
require File.join(rn_macos_path, "scripts/react_native_pods")
require File.join(File.dirname(`node --print "require.resolve('@react-native-community/cli-platform-ios/package.json')"`), "native_modules")
require File.join(File.dirname(`node --print "require.resolve('react-native-macos/package.json')"`), "scripts/react_native_pods")
require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")

base_path = Dir.pwd
# use_react_native does not support relative absolute paths
relative_rn_macos_path = Pathname.new(rn_macos_path).relative_path_from(Pathname.new(base_path)).to_s
relative_rn_macos_path = ''

# Delete the codegen build folder
FileUtils.remove_dir("./build", true)

prepare_react_native_project!

target 'ExpoMenuBar-macOS' do
platform :macos, '10.15'
platform :macos, '11.0'
use_expo_modules!
use_native_modules!
config = use_native_modules!

# Flags change depending on the env values.
flags = get_default_flags()

relative_rn_macos_path = "#{config[:reactNativePath]}-macos"
use_react_native!(
:path => relative_rn_macos_path,
# to enable hermes on macOS, change `false` to `true` and then install pods
:hermes_enabled => true
:hermes_enabled => false
)

# Pods specifically for macOS target
Expand All @@ -45,7 +40,7 @@ post_install do |installer|

project = installer.generated_aggregate_targets.first.user_project
project.targets.each do |target|
if target.name == 'ExpoMenuBar-macOS' # Replace with your actual target name
if target.name == 'ExpoMenuBar-macOS'
target.build_configurations.each do |config|
config.build_settings['OTHER_CFLAGS'] = other_cflags
end
Expand Down
Loading

0 comments on commit 25c6971

Please sign in to comment.