Skip to content

Commit dc3e22a

Browse files
authored
Updated to Swift 5, updates pods, and builds for Xcode 12 (#15)
1 parent 5e59a61 commit dc3e22a

138 files changed

Lines changed: 1548 additions & 3520 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0
1+
5.0

Example/Podfile

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,17 @@ target 'StyledText_Example' do
77

88
target 'StyledText_Tests' do
99
inherit! :search_paths
10-
pod 'Nimble', '~> 8.0.5'
10+
pod 'Nimble'
1111
pod 'Quick'
12-
pod 'FBSnapshotTestCase', '~> 2.1.4'
13-
pod 'Nimble-Snapshots', '~> 8.1.1'
12+
pod 'iOSSnapshotTestCase'
13+
pod 'Nimble-Snapshots'
1414
end
1515
end
1616

17-
# Hack until `swift_version` is added to the podspec https://github.com/CocoaPods/CocoaPods/issues/7134
18-
swift4 = ['FBSnapshotTestCase']
19-
2017
post_install do |installer|
21-
installer.pods_project.targets.each do |target|
22-
target.build_configurations.each do |config|
23-
config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = ''
24-
if swift4.include?(target.name)
25-
config.build_settings['SWIFT_VERSION'] = swift_version = '4.0'
26-
end
27-
end
18+
installer.pods_project.targets.each do |target|
19+
target.build_configurations.each do |config|
20+
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '10.0'
2821
end
22+
end
2923
end

Example/Podfile.lock

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,27 @@
11
PODS:
2-
- FBSnapshotTestCase (2.1.4):
3-
- FBSnapshotTestCase/SwiftSupport (= 2.1.4)
4-
- FBSnapshotTestCase/Core (2.1.4)
5-
- FBSnapshotTestCase/SwiftSupport (2.1.4):
6-
- FBSnapshotTestCase/Core
72
- iOSSnapshotTestCase (6.2.0):
83
- iOSSnapshotTestCase/SwiftSupport (= 6.2.0)
94
- iOSSnapshotTestCase/Core (6.2.0)
105
- iOSSnapshotTestCase/SwiftSupport (6.2.0):
116
- iOSSnapshotTestCase/Core
12-
- Nimble (8.0.5)
13-
- Nimble-Snapshots (8.1.1):
14-
- Nimble-Snapshots/Core (= 8.1.1)
15-
- Nimble-Snapshots/Core (8.1.1):
7+
- Nimble (8.1.2)
8+
- Nimble-Snapshots (8.2.1):
9+
- Nimble-Snapshots/Core (= 8.2.1)
10+
- Nimble-Snapshots/Core (8.2.1):
1611
- iOSSnapshotTestCase (~> 6.0)
1712
- Nimble (~> 8.0)
18-
- Quick (1.2.0)
19-
- StyledText (1.2.0)
13+
- Quick (3.0.0)
14+
- StyledText (1.3.0)
2015

2116
DEPENDENCIES:
22-
- FBSnapshotTestCase (~> 2.1.4)
23-
- Nimble (~> 8.0.5)
24-
- Nimble-Snapshots (~> 8.1.1)
17+
- iOSSnapshotTestCase
18+
- Nimble
19+
- Nimble-Snapshots
2520
- Quick
2621
- StyledText (from `../`)
2722

2823
SPEC REPOS:
2924
trunk:
30-
- FBSnapshotTestCase
3125
- iOSSnapshotTestCase
3226
- Nimble
3327
- Nimble-Snapshots
@@ -38,13 +32,12 @@ EXTERNAL SOURCES:
3832
:path: "../"
3933

4034
SPEC CHECKSUMS:
41-
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
4235
iOSSnapshotTestCase: 9ab44cb5aa62b84d31847f40680112e15ec579a6
43-
Nimble: 4ab1aeb9b45553c75b9687196b0fa0713170a332
44-
Nimble-Snapshots: 5058fb9b459e64371f54a0f8d9dde6f33db490a0
45-
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
46-
StyledText: beae3735c7519bb41b62763eb88aa31d17fc8243
36+
Nimble: 3864815b4703c7ebffba875973c70e854489fbae
37+
Nimble-Snapshots: 3a4750d83752625c8ebfdc588da105303ee2201e
38+
Quick: 6d9559f40647bc4d510103842ef2fdd882d753e2
39+
StyledText: f1f3da3cb2151c2821d7b84a462bb57d22eb0b33
4740

48-
PODFILE CHECKSUM: 3651a54dfc5a4b87eaeda450dfb810881dcebde4
41+
PODFILE CHECKSUM: c81093a63a3ec0078b3e3bb558a994249613c555
4942

50-
COCOAPODS: 1.9.0
43+
COCOAPODS: 1.9.1

Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIApplication+StrictKeyWindow.h

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

Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIApplication+StrictKeyWindow.m

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

Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Compare.h

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

Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Compare.m

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

Example/Pods/FBSnapshotTestCase/FBSnapshotTestCase/Categories/UIImage+Diff.h

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

0 commit comments

Comments
 (0)