Skip to content

Commit f216452

Browse files
blindmonkeybvirlet
andauthored
Fix SwiftPM (#1)
* Don’t define values in header file to avoid duplicate symbols * Remove Mac Catalyst to be able to integrate dependency with Tuist: tuist/tuist#4186 Co-authored-by: Bruno Virlet <bruno.virlet@gmail.com> Co-authored-by: Bruno Virlet <bvirlet@users.noreply.github.com>
1 parent 243e3cb commit f216452

File tree

4 files changed

+6002
-5969
lines changed

4 files changed

+6002
-5969
lines changed

Package@swift-5.5.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ let package = Package(
66
name: "libPhoneNumber",
77
platforms: [
88
.macOS(.v10_10),
9-
.macCatalyst(.v13),
109
.iOS(.v9),
1110
.tvOS(.v9),
1211
.watchOS(.v2)

libPhoneNumber/GeneratePhoneNumberHeader.sh

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ gzip -c "../generatedJSON/PhoneNumberMetaDataForTesting.json" > "$TEMPDIR/PhoneN
2424
gzip -c "../generatedJSON/PhoneNumberMetaData.json" > "$TEMPDIR/PhoneNumberMetaData.zip"
2525
gzip -c "../generatedJSON/ShortNumberMetaData.json" > "$TEMPDIR/ShortNumberMetaData.zip"
2626

27-
cat > "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
27+
cat > "NBGeneratedPhoneNumberMetaData.m" <<'EOF'
2828
/*****
2929
* Data Generated from GeneratePhoneNumberHeader.sh
3030
* Off of PhoneNumberMetaDataForTesting.json, PhoneNumberMetaData.json, and ShortNumberMetaData.json
@@ -45,49 +45,49 @@ cat > "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
4545
z_const Bytef kPhoneNumberMetaData[] = {
4646
EOF
4747

48-
cat "$TEMPDIR/PhoneNumberMetaDataForTesting.zip" | xxd -i >> "NBGeneratedPhoneNumberMetaData.h"
48+
cat "$TEMPDIR/PhoneNumberMetaDataForTesting.zip" | xxd -i >> "NBGeneratedPhoneNumberMetaData.m"
4949

50-
cat >> "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
50+
cat >> "NBGeneratedPhoneNumberMetaData.m" <<'EOF'
5151
};
5252
z_const size_t kPhoneNumberMetaDataCompressedLength = sizeof(kPhoneNumberMetaData);
5353
EOF
5454
LIB_SIZE=$(stat -f%z "../generatedJSON/PhoneNumberMetaDataForTesting.json")
55-
echo "z_const size_t kPhoneNumberMetaDataExpandedLength = $LIB_SIZE;" >> "NBGeneratedPhoneNumberMetaData.h"
55+
echo "z_const size_t kPhoneNumberMetaDataExpandedLength = $LIB_SIZE;" >> "NBGeneratedPhoneNumberMetaData.m"
5656

57-
cat >> "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
57+
cat >> "NBGeneratedPhoneNumberMetaData.m" <<'EOF'
5858
5959
#else // TESTING == 1
6060
6161
z_const Bytef kPhoneNumberMetaData[] = {
6262
EOF
6363

64-
cat "$TEMPDIR/PhoneNumberMetaData.zip" | xxd -i >> "NBGeneratedPhoneNumberMetaData.h"
64+
cat "$TEMPDIR/PhoneNumberMetaData.zip" | xxd -i >> "NBGeneratedPhoneNumberMetaData.m"
6565

66-
cat >> "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
66+
cat >> "NBGeneratedPhoneNumberMetaData.m" <<'EOF'
6767
};
6868
z_const size_t kPhoneNumberMetaDataCompressedLength = sizeof(kPhoneNumberMetaData);
6969
EOF
7070
LIB_SIZE=$(stat -f%z "../generatedJSON/PhoneNumberMetaData.json")
71-
echo "z_const size_t kPhoneNumberMetaDataExpandedLength = $LIB_SIZE;" >> "NBGeneratedPhoneNumberMetaData.h"
72-
echo "#endif // TESTING" >> "NBGeneratedPhoneNumberMetaData.h"
71+
echo "z_const size_t kPhoneNumberMetaDataExpandedLength = $LIB_SIZE;" >> "NBGeneratedPhoneNumberMetaData.m"
72+
echo "#endif // TESTING" >> "NBGeneratedPhoneNumberMetaData.m"
7373

7474
# ShortNumberMetadata
75-
cat >> "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
75+
cat >> "NBGeneratedPhoneNumberMetaData.m" <<'EOF'
7676
7777
#if SHORT_NUMBER_SUPPORT
7878
7979
z_const Bytef kShortNumberMetaData[] = {
8080
EOF
8181

82-
cat "$TEMPDIR/ShortNumberMetaData.zip" | xxd -i >> "NBGeneratedPhoneNumberMetaData.h"
82+
cat "$TEMPDIR/ShortNumberMetaData.zip" | xxd -i >> "NBGeneratedPhoneNumberMetaData.m"
8383

84-
cat >> "NBGeneratedPhoneNumberMetaData.h" <<'EOF'
84+
cat >> "NBGeneratedPhoneNumberMetaData.m" <<'EOF'
8585
};
8686
z_const size_t kShortNumberMetaDataCompressedLength = sizeof(kShortNumberMetaData);
8787
EOF
8888
LIB_SIZE=$(stat -f%z "../generatedJSON/ShortNumberMetaData.json")
89-
echo "z_const size_t kShortNumberMetaDataExpandedLength = $LIB_SIZE;" >> "NBGeneratedPhoneNumberMetaData.h"
90-
echo "#endif // SHORT_NUMBER_SUPPORT" >> "NBGeneratedPhoneNumberMetaData.h"
89+
echo "z_const size_t kShortNumberMetaDataExpandedLength = $LIB_SIZE;" >> "NBGeneratedPhoneNumberMetaData.m"
90+
echo "#endif // SHORT_NUMBER_SUPPORT" >> "NBGeneratedPhoneNumberMetaData.m"
9191

9292
rm "$TEMPDIR/PhoneNumberMetaDataForTesting.zip"
9393
rm "$TEMPDIR/PhoneNumberMetaData.zip"

0 commit comments

Comments
 (0)