Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/common-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"@react-native-community/cli": "18.0.0",
"@react-native-community/cli-platform-android": "18.0.0",
"@react-native-community/cli-platform-ios": "18.0.0",
"@react-native-community/slider": "5.0.1",
"@react-native-community/viewpager": "5.0.11",
"@react-native/babel-preset": "0.79.0",
"@react-native/eslint-config": "0.79.0",
Expand Down
14 changes: 0 additions & 14 deletions apps/common-app/src/legacy/release_tests/combo/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ import {
TapGestureHandler,
TextInput,
RectButton,
createNativeWrapper,
TapGestureHandlerStateChangeEvent,
} from 'react-native-gesture-handler';
import Slider from '@react-native-community/slider';

import Swipeable from 'react-native-gesture-handler/ReanimatedSwipeable';

Expand All @@ -30,12 +28,6 @@ import { PressBox } from '../../basic/multitap';
import { LoremIpsum } from '../../../common';
import { InfoButton } from './InfoButton';

const WrappedSlider = createNativeWrapper(Slider, {
shouldCancelWhenOutside: false,
shouldActivateOnStart: true,
disallowInterruption: true,
});

type TouchableHighlightProps = RNTouchableHighlightProps & {
onClick: () => void;
};
Expand Down Expand Up @@ -153,8 +145,6 @@ class Combo extends Component<ComboProps> {
<Text>Hello</Text>
</View>
</TouchableHighlight>
{/* @ts-ignore Slider is a union type and it seems like TS has some trouble with infering props type */}
<WrappedSlider style={styles.slider} />
<TextInput
style={styles.textinput}
placeholder="Type something here!"
Expand Down Expand Up @@ -250,10 +240,6 @@ const styles = StyleSheet.create({
fontWeight: 'bold',
backgroundColor: 'transparent',
},
slider: {
margin: 10,
flex: 1,
},
scrollView: {
flex: 1,
},
Expand Down
1 change: 0 additions & 1 deletion apps/expo-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"dependencies": {
"@expo/metro-runtime": "~6.1.2",
"@react-native-async-storage/async-storage": "2.2.0",
"@react-native-community/slider": "5.0.1",
"@react-native-community/viewpager": "5.0.11",
"@react-navigation/elements": "^2.3.8",
"@react-navigation/native": "^7.1.6",
Expand Down
6 changes: 6 additions & 0 deletions apps/macos-example/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,9 @@ gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
gem 'xcodeproj', '< 1.26.0'
gem 'concurrent-ruby', '< 1.3.4'

# Ruby 3.4.0 has removed some libraries from the standard library.
gem 'bigdecimal'
gem 'logger'
gem 'benchmark'
gem 'mutex_m'
4 changes: 4 additions & 0 deletions apps/macos-example/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,12 @@ PLATFORMS

DEPENDENCIES
activesupport (>= 6.1.7.5, != 7.1.0)
benchmark
bigdecimal
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
concurrent-ruby (< 1.3.4)
logger
mutex_m
xcodeproj (< 1.26.0)

RUBY VERSION
Expand Down
2 changes: 2 additions & 0 deletions apps/macos-example/macos/MacOSExample-macOS/AppDelegate.mm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#import "AppDelegate.h"

#import <React/RCTBundleURLProvider.h>
#import <ReactAppDependencyProvider/RCTAppDependencyProvider.h>

@implementation AppDelegate

Expand All @@ -10,6 +11,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification
// You can add your custom initial props in the dictionary below.
// They will be passed down to the ViewController used by React Native.
self.initialProps = @{};
self.dependencyProvider = [RCTAppDependencyProvider new];

return [super applicationDidFinishLaunching:notification];
}
Expand Down
26 changes: 14 additions & 12 deletions apps/macos-example/macos/MacOSExample-macOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSExceptionDomains</key>
<dict>
<key>localhost</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
</dict>
</dict>
</dict>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
Comment thread
m-bert marked this conversation as resolved.
<key>NSExceptionDomains</key>
<dict>
<key>localhost</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
</dict>
</dict>
</dict>
<key>NSMainStoryboardFile</key>
<string>Main</string>
<key>NSPrincipalClass</key>
Expand All @@ -43,5 +43,7 @@
<true/>
<key>NSSupportsSuddenTermination</key>
<true/>
<key>RCTNewArchEnabled</key>
<true/>
</dict>
</plist>
78 changes: 56 additions & 22 deletions apps/macos-example/macos/MacOSExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand All @@ -29,7 +29,7 @@
514201592437B4B40078DB4F /* MacOSExample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MacOSExample.entitlements; sourceTree = "<group>"; };
87331EFB346BFDA93E5B2BD1 /* libPods-MacOSExample-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MacOSExample-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
B5171904E6719F4BDED73559 /* Pods-MacOSExample-macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MacOSExample-macOS.release.xcconfig"; path = "Target Support Files/Pods-MacOSExample-macOS/Pods-MacOSExample-macOS.release.xcconfig"; sourceTree = "<group>"; };
D68EC4D024D3BD76718BD55A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
D68EC4D024D3BD76718BD55A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -67,7 +67,6 @@
37FF6647F5AC89DF645E6531 /* Pods-MacOSExample-macOS.debug.xcconfig */,
B5171904E6719F4BDED73559 /* Pods-MacOSExample-macOS.release.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
Expand Down Expand Up @@ -148,6 +147,7 @@
381D8A6E24576A4E00465D17 /* Bundle React Native code and images */,
6D0EC1752E57E7826E33BE11 /* [CP] Copy Pods Resources */,
D01A669245645FE4195DB892 /* [CP-User] Generate metadata for clangd */,
74A914BC92C8F532A0EFF786 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -300,13 +300,35 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MacOSExample-macOS/Pods-MacOSExample-macOS-resources.sh\"\n";
showEnvVarsInLog = 0;
};
74A914BC92C8F532A0EFF786 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-MacOSExample-macOS/Pods-MacOSExample-macOS-frameworks.sh",
"${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/macosx/hermes.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MacOSExample-macOS/Pods-MacOSExample-macOS-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
D01A669245645FE4195DB892 /* [CP-User] Generate metadata for clangd */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = true;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP-User] Generate metadata for clangd";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
shellScript = "../../../scripts/clangd-generate-xcode-metadata.sh";
Expand Down Expand Up @@ -352,7 +374,10 @@
CURRENT_PROJECT_VERSION = 1;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = "MacOSExample-iOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -373,7 +398,10 @@
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1;
INFOPLIST_FILE = "MacOSExample-iOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -395,8 +423,11 @@
CURRENT_PROJECT_VERSION = 1;
DEAD_CODE_STRIPPING = NO;
INFOPLIST_FILE = "MacOSExample-macos/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 15.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -418,8 +449,11 @@
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1;
INFOPLIST_FILE = "MacOSExample-macos/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 15.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -480,22 +514,22 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
LD_RUNPATH_SEARCH_PATHS = (
/usr/lib/swift,
"$(inherited)",
);
LIBRARY_SEARCH_PATHS = (
"$(SDKROOT)/usr/lib/swift",
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
"\"$(inherited)\"",
);
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
" ",
);
OTHER_LDFLAGS = "$(inherited) ";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
USE_HERMES = false;
USE_HERMES = true;
Comment thread
m-bert marked this conversation as resolved.
};
name = Debug;
};
Expand Down Expand Up @@ -540,20 +574,20 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
LD_RUNPATH_SEARCH_PATHS = (
/usr/lib/swift,
"$(inherited)",
);
LIBRARY_SEARCH_PATHS = (
"$(SDKROOT)/usr/lib/swift",
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
"\"$(inherited)\"",
);
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = (
"$(inherited)",
" ",
);
OTHER_LDFLAGS = "$(inherited) ";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = false;
USE_HERMES = true;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand Down
9 changes: 5 additions & 4 deletions apps/macos-example/macos/Podfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
require_relative '../node_modules/react-native-macos/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
require_relative '../../../scripts/clangd-add-xcode-step.rb'

prepare_react_native_project!

ENV['RCT_NEW_ARCH_ENABLED']='1'

ENV['GH_EXAMPLE_APP_NAME'] = 'MacOSExample'

target 'MacOSExample-macOS' do
platform :macos, '11.0'
platform :macos, '15.0'
Comment thread
m-bert marked this conversation as resolved.
Comment thread
m-bert marked this conversation as resolved.
use_native_modules!
Comment thread
m-bert marked this conversation as resolved.

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

use_react_native!(
:path => '../node_modules/react-native-macos',
:hermes_enabled => false,
# An absolute path to your application root.
:app_path => "#{Pod::Config.instance.installation_root}/..",
:new_arch_enabled => true
:new_arch_enabled => true,
:fabric_enabled => true
)

post_install do |installer|
Expand Down
Loading
Loading