Skip to content

Commit 1b2e1f2

Browse files
pinpongpinpong
committed
chore(example): ios build
1 parent f4768fc commit 1b2e1f2

File tree

10 files changed

+31
-93
lines changed

10 files changed

+31
-93
lines changed

‎.github/workflows/pull_request.yml‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -113,25 +113,4 @@ jobs:
113113
run: echo MAPS_API_KEY="API_KEY" >> example/ios/Secrets.xcconfig
114114

115115
- name: Build example for iOS
116-
working-directory: example/ios
117-
run: |
118-
set -o pipefail
119-
xcodebuild \
120-
-workspace GoogleMapsPlusExample.xcworkspace \
121-
-scheme GoogleMapsPlusExample \
122-
-configuration Debug \
123-
-destination "generic/platform=iOS Simulator" \
124-
CODE_SIGNING_ALLOWED=NO \
125-
CODE_SIGNING_REQUIRED=NO \
126-
CODE_SIGN_IDENTITY="-" \
127-
EXPANDED_CODE_SIGN_IDENTITY="-" \
128-
DEVELOPMENT_TEAM="" \
129-
PROVISIONING_PROFILE_SPECIFIER="" \
130-
| tee build_raw.log
131-
exit ${PIPESTATUS[0]}
132-
133-
- name: Dump raw Xcode logs
134-
if: failure()
135-
run: |
136-
echo "------ RAW BUILD LOG ------"
137-
cat example/ios/build_raw.log
116+
run: yarn build:ios

‎README.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ post_install do |installer|
3131
# :ccache_enabled => true
3232
)
3333

34-
require_relative '../node_modules/react-native-google-maps-plus/scripts/apply_ios_min_target'
35-
apply_ios_min_target(installer)
36-
3734
require_relative '../node_modules/react-native-google-maps-plus/scripts/svgkit_patch'
3835
apply_svgkit_patch(installer)
3936
end

‎example/ios/GoogleMapsPlusExample.xcodeproj/project.pbxproj‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@
1212
1C2CD62E2E2A54A300F92915 /* Release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 1C2CD62C2E2A54A300F92915 /* Release.xcconfig */; };
1313
1CFDC6AB2E6CA193005652FB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1CFDC6A32E6CA144005652FB /* InfoPlist.strings */; };
1414
1CFDC6AC2E6CA193005652FB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1CFDC6A62E6CA144005652FB /* InfoPlist.strings */; };
15+
2B37C898F2A1AAA9486D9912 /* Pods_GoogleMapsPlusExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5EA1D48E107416ADB6C60F35 /* Pods_GoogleMapsPlusExample.framework */; };
1516
50142BCB3C4DD87E00709364 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */; };
1617
761780ED2CA45674006654EE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 761780EC2CA45674006654EE /* AppDelegate.swift */; };
1718
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
18-
DD5DD77403BDC5B3CC7F2119 /* Pods_GoogleMapsPlusExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91040FE4CE7E973807E2B7F8 /* Pods_GoogleMapsPlusExample.framework */; };
1919
/* End PBXBuildFile section */
2020

2121
/* Begin PBXFileReference section */
2222
13B07F961A680F5B00A75B9A /* GoogleMapsPlusExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GoogleMapsPlusExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
2323
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = GoogleMapsPlusExample/Images.xcassets; sourceTree = "<group>"; };
2424
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = GoogleMapsPlusExample/Info.plist; sourceTree = "<group>"; };
2525
13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = GoogleMapsPlusExample/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
26+
15FC9D1ABAC4D1322D65610A /* Pods-GoogleMapsPlusExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsPlusExample.debug.xcconfig"; path = "Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample.debug.xcconfig"; sourceTree = "<group>"; };
2627
1C2CD62B2E2A54A300F92915 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = GoogleMapsPlusExample/Debug.xcconfig; sourceTree = "<group>"; };
2728
1C2CD62C2E2A54A300F92915 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = GoogleMapsPlusExample/Release.xcconfig; sourceTree = "<group>"; };
2829
1CFDC6A32E6CA144005652FB /* InfoPlist.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = InfoPlist.strings; sourceTree = "<group>"; };
2930
1CFDC6A62E6CA144005652FB /* InfoPlist.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = InfoPlist.strings; sourceTree = "<group>"; };
31+
5EA1D48E107416ADB6C60F35 /* Pods_GoogleMapsPlusExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GoogleMapsPlusExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3032
761780EC2CA45674006654EE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = GoogleMapsPlusExample/AppDelegate.swift; sourceTree = "<group>"; };
3133
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = GoogleMapsPlusExample/LaunchScreen.storyboard; sourceTree = "<group>"; };
32-
8EC765245960DD41A25CF0CB /* Pods-GoogleMapsPlusExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsPlusExample.debug.xcconfig"; path = "Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample.debug.xcconfig"; sourceTree = "<group>"; };
33-
91040FE4CE7E973807E2B7F8 /* Pods_GoogleMapsPlusExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GoogleMapsPlusExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
34-
AD1B9BCE7409F225D008C83D /* Pods-GoogleMapsPlusExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsPlusExample.release.xcconfig"; path = "Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample.release.xcconfig"; sourceTree = "<group>"; };
34+
9B44C46EC9F8E58D8B6DDD10 /* Pods-GoogleMapsPlusExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsPlusExample.release.xcconfig"; path = "Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample.release.xcconfig"; sourceTree = "<group>"; };
3535
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
3636
/* End PBXFileReference section */
3737

@@ -40,7 +40,7 @@
4040
isa = PBXFrameworksBuildPhase;
4141
buildActionMask = 2147483647;
4242
files = (
43-
DD5DD77403BDC5B3CC7F2119 /* Pods_GoogleMapsPlusExample.framework in Frameworks */,
43+
2B37C898F2A1AAA9486D9912 /* Pods_GoogleMapsPlusExample.framework in Frameworks */,
4444
);
4545
runOnlyForDeploymentPostprocessing = 0;
4646
};
@@ -85,7 +85,7 @@
8585
isa = PBXGroup;
8686
children = (
8787
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
88-
91040FE4CE7E973807E2B7F8 /* Pods_GoogleMapsPlusExample.framework */,
88+
5EA1D48E107416ADB6C60F35 /* Pods_GoogleMapsPlusExample.framework */,
8989
);
9090
name = Frameworks;
9191
sourceTree = "<group>";
@@ -122,8 +122,8 @@
122122
BBD78D7AC51CEA395F1C20DB /* Pods */ = {
123123
isa = PBXGroup;
124124
children = (
125-
8EC765245960DD41A25CF0CB /* Pods-GoogleMapsPlusExample.debug.xcconfig */,
126-
AD1B9BCE7409F225D008C83D /* Pods-GoogleMapsPlusExample.release.xcconfig */,
125+
15FC9D1ABAC4D1322D65610A /* Pods-GoogleMapsPlusExample.debug.xcconfig */,
126+
9B44C46EC9F8E58D8B6DDD10 /* Pods-GoogleMapsPlusExample.release.xcconfig */,
127127
);
128128
path = Pods;
129129
sourceTree = "<group>";
@@ -135,13 +135,13 @@
135135
isa = PBXNativeTarget;
136136
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "GoogleMapsPlusExample" */;
137137
buildPhases = (
138-
D60BC04072C44A5E40D46E31 /* [CP] Check Pods Manifest.lock */,
138+
A824DF843ACA8BC144DEDA05 /* [CP] Check Pods Manifest.lock */,
139139
13B07F871A680F5B00A75B9A /* Sources */,
140140
13B07F8C1A680F5B00A75B9A /* Frameworks */,
141141
13B07F8E1A680F5B00A75B9A /* Resources */,
142142
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
143-
3C753AB97194B8C98B30097F /* [CP] Embed Pods Frameworks */,
144-
5512C4B168EA05B15661CBA0 /* [CP] Copy Pods Resources */,
143+
357474998C3CCFA5FBC8D97B /* [CP] Embed Pods Frameworks */,
144+
DBF885C9135E7CF4993E741D /* [CP] Copy Pods Resources */,
145145
);
146146
buildRules = (
147147
);
@@ -218,7 +218,7 @@
218218
shellPath = /bin/sh;
219219
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";
220220
};
221-
3C753AB97194B8C98B30097F /* [CP] Embed Pods Frameworks */ = {
221+
357474998C3CCFA5FBC8D97B /* [CP] Embed Pods Frameworks */ = {
222222
isa = PBXShellScriptBuildPhase;
223223
buildActionMask = 2147483647;
224224
files = (
@@ -235,43 +235,43 @@
235235
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-frameworks.sh\"\n";
236236
showEnvVarsInLog = 0;
237237
};
238-
5512C4B168EA05B15661CBA0 /* [CP] Copy Pods Resources */ = {
238+
A824DF843ACA8BC144DEDA05 /* [CP] Check Pods Manifest.lock */ = {
239239
isa = PBXShellScriptBuildPhase;
240240
buildActionMask = 2147483647;
241241
files = (
242242
);
243243
inputFileListPaths = (
244-
"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-resources-${CONFIGURATION}-input-files.xcfilelist",
245244
);
246-
name = "[CP] Copy Pods Resources";
245+
inputPaths = (
246+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
247+
"${PODS_ROOT}/Manifest.lock",
248+
);
249+
name = "[CP] Check Pods Manifest.lock";
247250
outputFileListPaths = (
248-
"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-resources-${CONFIGURATION}-output-files.xcfilelist",
251+
);
252+
outputPaths = (
253+
"$(DERIVED_FILE_DIR)/Pods-GoogleMapsPlusExample-checkManifestLockResult.txt",
249254
);
250255
runOnlyForDeploymentPostprocessing = 0;
251256
shellPath = /bin/sh;
252-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-resources.sh\"\n";
257+
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";
253258
showEnvVarsInLog = 0;
254259
};
255-
D60BC04072C44A5E40D46E31 /* [CP] Check Pods Manifest.lock */ = {
260+
DBF885C9135E7CF4993E741D /* [CP] Copy Pods Resources */ = {
256261
isa = PBXShellScriptBuildPhase;
257262
buildActionMask = 2147483647;
258263
files = (
259264
);
260265
inputFileListPaths = (
266+
"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-resources-${CONFIGURATION}-input-files.xcfilelist",
261267
);
262-
inputPaths = (
263-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
264-
"${PODS_ROOT}/Manifest.lock",
265-
);
266-
name = "[CP] Check Pods Manifest.lock";
268+
name = "[CP] Copy Pods Resources";
267269
outputFileListPaths = (
268-
);
269-
outputPaths = (
270-
"$(DERIVED_FILE_DIR)/Pods-GoogleMapsPlusExample-checkManifestLockResult.txt",
270+
"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-resources-${CONFIGURATION}-output-files.xcfilelist",
271271
);
272272
runOnlyForDeploymentPostprocessing = 0;
273273
shellPath = /bin/sh;
274-
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";
274+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-resources.sh\"\n";
275275
showEnvVarsInLog = 0;
276276
};
277277
/* End PBXShellScriptBuildPhase section */

‎example/ios/GoogleMapsPlusExample/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<true/>
3737
</dict>
3838
<key>NSLocationWhenInUseUsageDescription</key>
39-
<string></string>
39+
<string>This app needs access to your location to show your current position on the map.</string>
4040
<key>RCTNewArchEnabled</key>
4141
<true/>
4242
<key>UILaunchStoryboardName</key>

‎example/ios/Podfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ target 'GoogleMapsPlusExample' do
2929
# :ccache_enabled => true
3030
)
3131

32-
require_relative '../../scripts/apply_ios_min_target'
33-
apply_ios_min_target(installer)
34-
3532
require_relative '../../scripts/svgkit_patch'
3633
apply_svgkit_patch(installer)
3734
end

‎example/ios/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3128,6 +3128,6 @@ SPEC CHECKSUMS:
31283128
SVGKit: 1ad7513f8c74d9652f94ed64ddecda1a23864dea
31293129
Yoga: 526f25666395d30c297d53154398ffd249eaf9e1
31303130

3131-
PODFILE CHECKSUM: 4f6b14fe56d58b658ff5e017812036647dc0fb67
3131+
PODFILE CHECKSUM: 53fea21acf44c419ecb277b368cb4c1e34124dfb
31323132

31333133
COCOAPODS: 1.15.2

‎example/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"start": "watchman watch-del-all && react-native start",
99
"ios:pods": "rm -f ios/Podfile.lock && rm -rf ios/Pods && cd ios && bundle install && bundle exec pod install --repo-update",
1010
"build:android": "react-native build-android",
11-
"build:ios": "react-native build-ios --mode Debug --extra-params 'CODE_SIGNING_ALLOWED=NO CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY=\"-\" EXPANDED_CODE_SIGN_IDENTITY=\"-\" DEVELOPMENT_TEAM=\"\" PROVISIONING_PROFILE_SPECIFIER=\"\"'"
11+
"build:ios": "react-native build-ios --mode Debug --extra-params 'CODE_SIGNING_ALLOWED=NO CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY=\"-\" EXPANDED_CODE_SIGN_IDENTITY=\"-\" DEVELOPMENT_TEAM=\"\" PROVISIONING_PROFILE_SPECIFIER=\"\" COCOAPODS_PARALLEL_CODE_SIGN=false -destination generic/platform=iOS'"
1212
},
1313
"dependencies": {
1414
"@react-navigation/native": "7.1.19",

‎expoConfig/src/ios/withIosGoogleMapsPlus.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ const withIosGoogleMapsPlus: ConfigPlugin<RNGoogleMapsPlusExpoPluginProps> = (
4040
}
4141

4242
const podFilePatch = `
43-
require_relative '../node_modules/react-native-google-maps-plus/scripts/apply_ios_min_target'
44-
apply_ios_min_target(installer)
45-
4643
require_relative '../node_modules/react-native-google-maps-plus/scripts/svgkit_patch'
4744
apply_svgkit_patch(installer)
4845
`;

‎scripts/apply_ios_min_target.rb‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎scripts/svgkit_patch.rb‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ def apply_svgkit_patch(installer)
2929

3030
File.write(file, new_text)
3131
count += 1
32-
puts " Patched #{File.basename(file)}"
3332
end
3433

3534
if count > 0
@@ -38,17 +37,5 @@ def apply_svgkit_patch(installer)
3837
puts "[#{package_name}] SVGKit was already patched or no matches"
3938
end
4039

41-
installer.pods_project.targets.each do |target|
42-
next unless target.name.include?("SVGKit")
4340

44-
target.build_configurations.each do |config|
45-
current = config.build_settings['IPHONEOS_DEPLOYMENT_TARGET']
46-
v = current.to_f > 0 ? current.to_f : 0.0
47-
48-
if v < 16.0
49-
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = "16.0"
50-
puts "[#{package_name}] Set iOS deployment target for SVGKit (#{current || 'none'} → 16.0)"
51-
end
52-
end
53-
end
5441
end

0 commit comments

Comments
 (0)