Skip to content

Commit 4345944

Browse files
stephencelisstephencelis
authored
Swift 5 (#51)
* Swift 5 * Dockerfile * Fix project.yml * swiftenv * Bump * "Fix" Linux * Scope XcodeGen to development
1 parent ac09f71 commit 4345944

15 files changed

+287
-231
lines changed

‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
jobs:
44
build:
55
macos:
6-
xcode: "10.1.0"
6+
xcode: "10.2.0"
77

88
steps:
99
- checkout

‎.swift-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2.1
1+
swift-5.0-DEVELOPMENT-SNAPSHOT-2019-03-10-a

‎Carthage/Checkouts/swift-snapshot-testing

Submodule swift-snapshot-testing updated 30 files

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM swift:4.2
1+
FROM norionomura/swift:swift-5.0-branch
22

33
WORKDIR /package
44

‎Html.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
2525
:tag => s.version
2626
}
2727

28-
s.swift_version = "4.2.1"
28+
s.swift_version = "5.0"
2929

3030
s.ios.deployment_target = "8.0"
3131
s.osx.deployment_target = "10.9"

‎Html.xcodeproj/project.pbxproj

+54
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,9 @@
997997
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.HtmlSnapshotTestingTests-tvOS";
998998
PRODUCT_NAME = HtmlSnapshotTestingTests;
999999
SDKROOT = appletvos;
1000+
SWIFT_VERSION = 5.0;
10001001
TARGETED_DEVICE_FAMILY = 3;
1002+
TVOS_DEPLOYMENT_TARGET = 10.0;
10011003
};
10021004
name = Release;
10031005
};
@@ -1022,7 +1024,9 @@
10221024
PRODUCT_NAME = HtmlSnapshotTesting;
10231025
SDKROOT = appletvos;
10241026
SKIP_INSTALL = YES;
1027+
SWIFT_VERSION = 5.0;
10251028
TARGETED_DEVICE_FAMILY = 3;
1029+
TVOS_DEPLOYMENT_TARGET = 10.0;
10261030
VERSIONING_SYSTEM = "apple-generic";
10271031
};
10281032
name = Debug;
@@ -1035,7 +1039,9 @@
10351039
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.HtmlTests-tvOS";
10361040
PRODUCT_NAME = HtmlTests;
10371041
SDKROOT = appletvos;
1042+
SWIFT_VERSION = 5.0;
10381043
TARGETED_DEVICE_FAMILY = 3;
1044+
TVOS_DEPLOYMENT_TARGET = 10.0;
10391045
};
10401046
name = Debug;
10411047
};
@@ -1055,11 +1061,13 @@
10551061
);
10561062
INFOPLIST_FILE = Info.plist;
10571063
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1064+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
10581065
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
10591066
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.HtmlSnapshotTesting-iOS";
10601067
PRODUCT_NAME = HtmlSnapshotTesting;
10611068
SDKROOT = iphoneos;
10621069
SKIP_INSTALL = YES;
1070+
SWIFT_VERSION = 5.0;
10631071
TARGETED_DEVICE_FAMILY = "1,2";
10641072
VERSIONING_SYSTEM = "apple-generic";
10651073
};
@@ -1073,7 +1081,9 @@
10731081
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.HtmlSnapshotTestingTests-tvOS";
10741082
PRODUCT_NAME = HtmlSnapshotTestingTests;
10751083
SDKROOT = appletvos;
1084+
SWIFT_VERSION = 5.0;
10761085
TARGETED_DEVICE_FAMILY = 3;
1086+
TVOS_DEPLOYMENT_TARGET = 10.0;
10771087
};
10781088
name = Debug;
10791089
};
@@ -1083,9 +1093,11 @@
10831093
BUNDLE_LOADER = "$(TEST_HOST)";
10841094
COMBINE_HIDPI_IMAGES = YES;
10851095
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1096+
MACOSX_DEPLOYMENT_TARGET = 10.10;
10861097
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.HtmlTests-macOS";
10871098
PRODUCT_NAME = HtmlTests;
10881099
SDKROOT = macosx;
1100+
SWIFT_VERSION = 5.0;
10891101
};
10901102
name = Debug;
10911103
};
@@ -1105,7 +1117,9 @@
11051117
PRODUCT_NAME = Html;
11061118
SDKROOT = appletvos;
11071119
SKIP_INSTALL = YES;
1120+
SWIFT_VERSION = 5.0;
11081121
TARGETED_DEVICE_FAMILY = 3;
1122+
TVOS_DEPLOYMENT_TARGET = 9.0;
11091123
VERSIONING_SYSTEM = "apple-generic";
11101124
};
11111125
name = Debug;
@@ -1121,11 +1135,13 @@
11211135
DYLIB_INSTALL_NAME_BASE = "@rpath";
11221136
INFOPLIST_FILE = Info.plist;
11231137
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1138+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
11241139
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
11251140
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.Html-iOS";
11261141
PRODUCT_NAME = Html;
11271142
SDKROOT = iphoneos;
11281143
SKIP_INSTALL = YES;
1144+
SWIFT_VERSION = 5.0;
11291145
TARGETED_DEVICE_FAMILY = "1,2";
11301146
VERSIONING_SYSTEM = "apple-generic";
11311147
};
@@ -1147,7 +1163,9 @@
11471163
PRODUCT_NAME = Html;
11481164
SDKROOT = appletvos;
11491165
SKIP_INSTALL = YES;
1166+
SWIFT_VERSION = 5.0;
11501167
TARGETED_DEVICE_FAMILY = 3;
1168+
TVOS_DEPLOYMENT_TARGET = 9.0;
11511169
VERSIONING_SYSTEM = "apple-generic";
11521170
};
11531171
name = Release;
@@ -1173,7 +1191,9 @@
11731191
PRODUCT_NAME = HtmlSnapshotTesting;
11741192
SDKROOT = appletvos;
11751193
SKIP_INSTALL = YES;
1194+
SWIFT_VERSION = 5.0;
11761195
TARGETED_DEVICE_FAMILY = 3;
1196+
TVOS_DEPLOYMENT_TARGET = 10.0;
11771197
VERSIONING_SYSTEM = "apple-generic";
11781198
};
11791199
name = Release;
@@ -1186,7 +1206,9 @@
11861206
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.HtmlTests-tvOS";
11871207
PRODUCT_NAME = HtmlTests;
11881208
SDKROOT = appletvos;
1209+
SWIFT_VERSION = 5.0;
11891210
TARGETED_DEVICE_FAMILY = 3;
1211+
TVOS_DEPLOYMENT_TARGET = 10.0;
11901212
};
11911213
name = Release;
11921214
};
@@ -1199,6 +1221,7 @@
11991221
PRODUCT_NAME = HtmlTests;
12001222
SDKROOT = watchos;
12011223
SKIP_INSTALL = YES;
1224+
SWIFT_VERSION = 5.0;
12021225
TARGETED_DEVICE_FAMILY = 4;
12031226
};
12041227
name = Debug;
@@ -1207,10 +1230,12 @@
12071230
isa = XCBuildConfiguration;
12081231
buildSettings = {
12091232
BUNDLE_LOADER = "$(TEST_HOST)";
1233+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
12101234
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12111235
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.HtmlSnapshotTestingTests-iOS";
12121236
PRODUCT_NAME = HtmlSnapshotTestingTests;
12131237
SDKROOT = iphoneos;
1238+
SWIFT_VERSION = 5.0;
12141239
TARGETED_DEVICE_FAMILY = "1,2";
12151240
};
12161241
name = Release;
@@ -1230,8 +1255,10 @@
12301255
PRODUCT_NAME = Html;
12311256
SDKROOT = watchos;
12321257
SKIP_INSTALL = YES;
1258+
SWIFT_VERSION = 5.0;
12331259
TARGETED_DEVICE_FAMILY = 4;
12341260
VERSIONING_SYSTEM = "apple-generic";
1261+
WATCHOS_DEPLOYMENT_TARGET = 2.0;
12351262
};
12361263
name = Release;
12371264
};
@@ -1253,10 +1280,12 @@
12531280
INFOPLIST_FILE = Info.plist;
12541281
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
12551282
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
1283+
MACOSX_DEPLOYMENT_TARGET = 10.10;
12561284
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.HtmlSnapshotTesting-macOS";
12571285
PRODUCT_NAME = HtmlSnapshotTesting;
12581286
SDKROOT = macosx;
12591287
SKIP_INSTALL = YES;
1288+
SWIFT_VERSION = 5.0;
12601289
VERSIONING_SYSTEM = "apple-generic";
12611290
};
12621291
name = Debug;
@@ -1265,10 +1294,12 @@
12651294
isa = XCBuildConfiguration;
12661295
buildSettings = {
12671296
BUNDLE_LOADER = "$(TEST_HOST)";
1297+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
12681298
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12691299
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.HtmlTests-iOS";
12701300
PRODUCT_NAME = HtmlTests;
12711301
SDKROOT = iphoneos;
1302+
SWIFT_VERSION = 5.0;
12721303
TARGETED_DEVICE_FAMILY = "1,2";
12731304
};
12741305
name = Debug;
@@ -1277,10 +1308,12 @@
12771308
isa = XCBuildConfiguration;
12781309
buildSettings = {
12791310
BUNDLE_LOADER = "$(TEST_HOST)";
1311+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
12801312
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12811313
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.HtmlSnapshotTestingTests-iOS";
12821314
PRODUCT_NAME = HtmlSnapshotTestingTests;
12831315
SDKROOT = iphoneos;
1316+
SWIFT_VERSION = 5.0;
12841317
TARGETED_DEVICE_FAMILY = "1,2";
12851318
};
12861319
name = Debug;
@@ -1354,11 +1387,13 @@
13541387
DYLIB_INSTALL_NAME_BASE = "@rpath";
13551388
INFOPLIST_FILE = Info.plist;
13561389
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1390+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
13571391
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
13581392
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.Html-iOS";
13591393
PRODUCT_NAME = Html;
13601394
SDKROOT = iphoneos;
13611395
SKIP_INSTALL = YES;
1396+
SWIFT_VERSION = 5.0;
13621397
TARGETED_DEVICE_FAMILY = "1,2";
13631398
VERSIONING_SYSTEM = "apple-generic";
13641399
};
@@ -1379,8 +1414,10 @@
13791414
PRODUCT_NAME = Html;
13801415
SDKROOT = watchos;
13811416
SKIP_INSTALL = YES;
1417+
SWIFT_VERSION = 5.0;
13821418
TARGETED_DEVICE_FAMILY = 4;
13831419
VERSIONING_SYSTEM = "apple-generic";
1420+
WATCHOS_DEPLOYMENT_TARGET = 2.0;
13841421
};
13851422
name = Debug;
13861423
};
@@ -1400,11 +1437,13 @@
14001437
);
14011438
INFOPLIST_FILE = Info.plist;
14021439
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1440+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
14031441
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
14041442
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.HtmlSnapshotTesting-iOS";
14051443
PRODUCT_NAME = HtmlSnapshotTesting;
14061444
SDKROOT = iphoneos;
14071445
SKIP_INSTALL = YES;
1446+
SWIFT_VERSION = 5.0;
14081447
TARGETED_DEVICE_FAMILY = "1,2";
14091448
VERSIONING_SYSTEM = "apple-generic";
14101449
};
@@ -1414,10 +1453,12 @@
14141453
isa = XCBuildConfiguration;
14151454
buildSettings = {
14161455
BUNDLE_LOADER = "$(TEST_HOST)";
1456+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
14171457
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
14181458
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.HtmlTests-iOS";
14191459
PRODUCT_NAME = HtmlTests;
14201460
SDKROOT = iphoneos;
1461+
SWIFT_VERSION = 5.0;
14211462
TARGETED_DEVICE_FAMILY = "1,2";
14221463
};
14231464
name = Release;
@@ -1435,10 +1476,12 @@
14351476
INFOPLIST_FILE = Info.plist;
14361477
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
14371478
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
1479+
MACOSX_DEPLOYMENT_TARGET = 10.10;
14381480
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.Html-macOS";
14391481
PRODUCT_NAME = Html;
14401482
SDKROOT = macosx;
14411483
SKIP_INSTALL = YES;
1484+
SWIFT_VERSION = 5.0;
14421485
VERSIONING_SYSTEM = "apple-generic";
14431486
};
14441487
name = Debug;
@@ -1452,6 +1495,7 @@
14521495
PRODUCT_NAME = HtmlTests;
14531496
SDKROOT = watchos;
14541497
SKIP_INSTALL = YES;
1498+
SWIFT_VERSION = 5.0;
14551499
TARGETED_DEVICE_FAMILY = 4;
14561500
};
14571501
name = Release;
@@ -1469,10 +1513,12 @@
14691513
INFOPLIST_FILE = Info.plist;
14701514
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
14711515
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
1516+
MACOSX_DEPLOYMENT_TARGET = 10.10;
14721517
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.Html-macOS";
14731518
PRODUCT_NAME = Html;
14741519
SDKROOT = macosx;
14751520
SKIP_INSTALL = YES;
1521+
SWIFT_VERSION = 5.0;
14761522
VERSIONING_SYSTEM = "apple-generic";
14771523
};
14781524
name = Release;
@@ -1495,10 +1541,12 @@
14951541
INFOPLIST_FILE = Info.plist;
14961542
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
14971543
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
1544+
MACOSX_DEPLOYMENT_TARGET = 10.10;
14981545
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.HtmlSnapshotTesting-macOS";
14991546
PRODUCT_NAME = HtmlSnapshotTesting;
15001547
SDKROOT = macosx;
15011548
SKIP_INSTALL = YES;
1549+
SWIFT_VERSION = 5.0;
15021550
VERSIONING_SYSTEM = "apple-generic";
15031551
};
15041552
name = Release;
@@ -1559,9 +1607,11 @@
15591607
BUNDLE_LOADER = "$(TEST_HOST)";
15601608
COMBINE_HIDPI_IMAGES = YES;
15611609
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1610+
MACOSX_DEPLOYMENT_TARGET = 10.10;
15621611
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.HtmlSnapshotTestingTests-macOS";
15631612
PRODUCT_NAME = HtmlSnapshotTestingTests;
15641613
SDKROOT = macosx;
1614+
SWIFT_VERSION = 5.0;
15651615
};
15661616
name = Debug;
15671617
};
@@ -1571,9 +1621,11 @@
15711621
BUNDLE_LOADER = "$(TEST_HOST)";
15721622
COMBINE_HIDPI_IMAGES = YES;
15731623
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1624+
MACOSX_DEPLOYMENT_TARGET = 10.10;
15741625
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.HtmlTests-macOS";
15751626
PRODUCT_NAME = HtmlTests;
15761627
SDKROOT = macosx;
1628+
SWIFT_VERSION = 5.0;
15771629
};
15781630
name = Release;
15791631
};
@@ -1583,9 +1635,11 @@
15831635
BUNDLE_LOADER = "$(TEST_HOST)";
15841636
COMBINE_HIDPI_IMAGES = YES;
15851637
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1638+
MACOSX_DEPLOYMENT_TARGET = 10.10;
15861639
PRODUCT_BUNDLE_IDENTIFIER = "co.pointfree.HtmlSnapshotTestingTests-macOS";
15871640
PRODUCT_NAME = HtmlSnapshotTestingTests;
15881641
SDKROOT = macosx;
1642+
SWIFT_VERSION = 5.0;
15891643
};
15901644
name = Release;
15911645
};

‎HtmlSnapshotTesting.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
2222
:tag => s.version
2323
}
2424

25-
s.swift_version = "4.2.1"
25+
s.swift_version = "5.0"
2626

2727
s.ios.deployment_target = "10.0"
2828
s.osx.deployment_target = "10.10"

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2018 Brandon Williams
3+
Copyright (c) 2019 Point-Free, Inc.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ carthage:
44
carthage update --no-build --use-submodules
55

66
xcodeproj:
7-
swift run xcodegen
7+
PF_DEVELOP=1 swift run xcodegen
88

99
test-linux:
1010
docker build --tag html . \

0 commit comments

Comments
 (0)