Skip to content

Commit

Permalink
[ios][core][tools] fix expo go versioning issues on ios (expo#23012)
Browse files Browse the repository at this point in the history
# Why

fix expo-go ios versioning for sdk 49
close ENG-8955

# How

- a lot of mess transform rules update mainly for react-native 0.72 and reanimated v3
- [core] rename `ExpoRuntime -> EXRuntime` in objc for versioning
- [updates] force casting for the `UpdatesConfig` (i'll leave comment for this)
- [react-native-lab] add correct dependencies to make versioned code build passed

# Test Plan

`et add-sdk -p ios -s 49.0.0` + ios versioned expo-go + sdk49 ncl
  • Loading branch information
Kudo authored Jun 22, 2023
1 parent 71ea603 commit 453643f
Show file tree
Hide file tree
Showing 21 changed files with 287 additions and 164 deletions.
2 changes: 1 addition & 1 deletion ios/ExpoKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Pod::Spec.new do |s|
s.default_subspec = "Core"
s.source = { :git => "http://github.com/expo/expo.git" }
s.xcconfig = {
'CLANG_CXX_LANGUAGE_STANDARD' => 'gnu++14',
'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17',
'SYSTEM_HEADER_SEARCH_PATHS' => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\"",
'OTHER_CPLUSPLUSFLAGS' => [
"$(OTHER_CFLAGS)",
Expand Down
4 changes: 2 additions & 2 deletions ios/Exponent/Supporting/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
Expand Down Expand Up @@ -150,7 +152,5 @@
<string>Automatic</string>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
#import <objc/runtime.h>

#ifdef HAVE_GOOGLE_MAPS_UTILS
#import "GMUKMLParser.h"
#import "GMUPlacemark.h"
#import "GMUPoint.h"
#import "GMUGeometryRenderer.h"
#import <Google-Maps-iOS-Utils/GMUKMLParser.h>
#import <Google-Maps-iOS-Utils/GMUPlacemark.h>
#import <Google-Maps-iOS-Utils/GMUPoint.h>
#import <Google-Maps-iOS-Utils/GMUGeometryRenderer.h>
#define REQUIRES_GOOGLE_MAPS_UTILS(feature) do {} while (0)
#else
#define GMUKMLParser void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#import <React/RCTInspectorPackagerConnection.h>
#import <SocketRocket/SRWebSocket.h>

#import "Expo_Go-Swift.h"
#import "ExpoModulesCore-Swift.h"

#pragma mark - RCTInspectorPackagerConnection category interface
Expand Down
Loading

0 comments on commit 453643f

Please sign in to comment.