Skip to content

Commit dadf431

Browse files
dimatdimat
committed
Support Apple Silicon simulators
1 parent 36818e9 commit dadf431

File tree

24 files changed

+217
-39
lines changed

24 files changed

+217
-39
lines changed

‎Example/NumberSpellOutFormatter.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,7 @@
154154
6003F586195388D20070C39A /* Sources */,
155155
6003F587195388D20070C39A /* Frameworks */,
156156
6003F588195388D20070C39A /* Resources */,
157-
05BD426D47AF44B8A8ABBAC5 /* [CP] Embed Pods Frameworks */,
158-
F55BD23B4E086D0FD66A3F8D /* [CP] Copy Pods Resources */,
157+
B1104E40C391AD59425EC7E6 /* [CP] Embed Pods Frameworks */,
159158
);
160159
buildRules = (
161160
);
@@ -214,24 +213,6 @@
214213
/* End PBXResourcesBuildPhase section */
215214

216215
/* Begin PBXShellScriptBuildPhase section */
217-
05BD426D47AF44B8A8ABBAC5 /* [CP] Embed Pods Frameworks */ = {
218-
isa = PBXShellScriptBuildPhase;
219-
buildActionMask = 2147483647;
220-
files = (
221-
);
222-
inputPaths = (
223-
"${SRCROOT}/Pods/Target Support Files/Pods-NumberSpellOutFormatter_Example/Pods-NumberSpellOutFormatter_Example-frameworks.sh",
224-
"${BUILT_PRODUCTS_DIR}/NumberSpellOutFormatter/NumberSpellOutFormatter.framework",
225-
);
226-
name = "[CP] Embed Pods Frameworks";
227-
outputPaths = (
228-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NumberSpellOutFormatter.framework",
229-
);
230-
runOnlyForDeploymentPostprocessing = 0;
231-
shellPath = /bin/sh;
232-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-NumberSpellOutFormatter_Example/Pods-NumberSpellOutFormatter_Example-frameworks.sh\"\n";
233-
showEnvVarsInLog = 0;
234-
};
235216
56F448B76A31EDBB42B93EC7 /* [CP] Check Pods Manifest.lock */ = {
236217
isa = PBXShellScriptBuildPhase;
237218
buildActionMask = 2147483647;
@@ -250,19 +231,22 @@
250231
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";
251232
showEnvVarsInLog = 0;
252233
};
253-
F55BD23B4E086D0FD66A3F8D /* [CP] Copy Pods Resources */ = {
234+
B1104E40C391AD59425EC7E6 /* [CP] Embed Pods Frameworks */ = {
254235
isa = PBXShellScriptBuildPhase;
255236
buildActionMask = 2147483647;
256237
files = (
257238
);
258239
inputPaths = (
240+
"${PODS_ROOT}/Target Support Files/Pods-NumberSpellOutFormatter_Example/Pods-NumberSpellOutFormatter_Example-frameworks.sh",
241+
"${BUILT_PRODUCTS_DIR}/NumberSpellOutFormatter/NumberSpellOutFormatter.framework",
259242
);
260-
name = "[CP] Copy Pods Resources";
243+
name = "[CP] Embed Pods Frameworks";
261244
outputPaths = (
245+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NumberSpellOutFormatter.framework",
262246
);
263247
runOnlyForDeploymentPostprocessing = 0;
264248
shellPath = /bin/sh;
265-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-NumberSpellOutFormatter_Example/Pods-NumberSpellOutFormatter_Example-resources.sh\"\n";
249+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NumberSpellOutFormatter_Example/Pods-NumberSpellOutFormatter_Example-frameworks.sh\"\n";
266250
showEnvVarsInLog = 0;
267251
};
268252
/* End PBXShellScriptBuildPhase section */

‎Example/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use_frameworks!
2-
platform :ios, '8.0'
2+
platform :ios, '14.0'
33

44
target 'NumberSpellOutFormatter_Example' do
55
pod 'NumberSpellOutFormatter', :path => '../', :testspecs => ['Tests']

‎Example/Podfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ DEPENDENCIES:
1010

1111
EXTERNAL SOURCES:
1212
NumberSpellOutFormatter:
13-
:path: ../
13+
:path: "../"
1414

1515
SPEC CHECKSUMS:
16-
NumberSpellOutFormatter: 24de047b4fe7c7948e677344cfdd47d1388cfc4a
16+
NumberSpellOutFormatter: 9cca067cb39240db2f683043dda92c77684e879b
1717

18-
PODFILE CHECKSUM: dac37676ed9345ddfb8902ebb3c9247ebf7b4248
18+
PODFILE CHECKSUM: 6fa02ad5bc21c4ced1791a729b5f3cc64a34e0a3
1919

20-
COCOAPODS: 1.4.0
20+
COCOAPODS: 1.11.3

‎NumberSpellOutFormatter.podspec‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'NumberSpellOutFormatter'
11-
s.version = '1.0.0'
11+
s.version = '1.0.1'
1212
s.summary = 'Spell out numbers in any language'
1313

1414
s.description = <<-DESC
@@ -22,8 +22,8 @@ also supports ordinal numbers with any additional modes that are applicable for
2222
s.author = { 'Dmitry Matyukhin' => '[email protected]' }
2323
s.source = { :git => 'https://github.com/dimat/DMNumberSpellOutFormatter.git', :tag => s.version.to_s }
2424

25-
s.ios.deployment_target = '8.0'
26-
s.swift_version = '3.2'
25+
s.ios.deployment_target = '11.0'
26+
s.swift_version = '5.2'
2727

2828
s.source_files = ['NumberSpellOutFormatter/Classes/**/*']
2929

@@ -34,7 +34,7 @@ also supports ordinal numbers with any additional modes that are applicable for
3434
s.subspec 'precompiled' do |ss|
3535
ss.source_files = 'icu4c-static-lib/include/**/*.h'
3636
ss.private_header_files = 'icu4c-static-lib/include/**/*.h'
37-
ss.vendored_libraries = 'icu4c-static-lib/lib/**/*.a'
37+
ss.vendored_frameworks = 'icu4c-static-lib/frameworks/**/*.xcframework'
3838

3939
ss.header_mappings_dir = 'icu4c-static-lib/include'
4040
ss.libraries = "c++"
@@ -43,14 +43,8 @@ also supports ordinal numbers with any additional modes that are applicable for
4343
# of one of the libs gets to 150M while GitHub only allows maximum 100M
4444

4545
# This will prevent warnings about missing architectures
46-
simulator_ldflags = '-l"c++" -l"icudata-simulator" -l"icui18n-simulator" -l"icuio-simulator" -l"icuuc-simulator"'
47-
arm_ldflags = '-l"c++" -l"icudata-arm" -l"icui18n-arm" -l"icuio-arm" -l"icuuc-arm"'
4846
ss.pod_target_xcconfig = {
49-
'OTHER_LDFLAGS[arch=armv7]' => arm_ldflags,
50-
'OTHER_LDFLAGS[arch=armv7s]' => arm_ldflags,
51-
'OTHER_LDFLAGS[arch=arm64]' => arm_ldflags,
52-
'OTHER_LDFLAGS[arch=i386]' => simulator_ldflags,
53-
'OTHER_LDFLAGS[arch=x86_64]' => simulator_ldflags
47+
'OTHER_LDFLAGS' => '-l"c++"'
5448
}
5549
end
5650

‎icu4c-static-lib/frameworks/libicudata.xcframework/Info.plist‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>AvailableLibraries</key>
6+
<array>
7+
<dict>
8+
<key>LibraryIdentifier</key>
9+
<string>ios-arm64_x86_64-simulator</string>
10+
<key>LibraryPath</key>
11+
<string>libicudata.a</string>
12+
<key>SupportedArchitectures</key>
13+
<array>
14+
<string>arm64</string>
15+
<string>x86_64</string>
16+
</array>
17+
<key>SupportedPlatform</key>
18+
<string>ios</string>
19+
<key>SupportedPlatformVariant</key>
20+
<string>simulator</string>
21+
</dict>
22+
<dict>
23+
<key>LibraryIdentifier</key>
24+
<string>ios-arm64</string>
25+
<key>LibraryPath</key>
26+
<string>libicudata.a</string>
27+
<key>SupportedArchitectures</key>
28+
<array>
29+
<string>arm64</string>
30+
</array>
31+
<key>SupportedPlatform</key>
32+
<string>ios</string>
33+
</dict>
34+
</array>
35+
<key>CFBundlePackageType</key>
36+
<string>XFWK</string>
37+
<key>XCFrameworkFormatVersion</key>
38+
<string>1.0</string>
39+
</dict>
40+
</plist>

0 commit comments

Comments
 (0)