Skip to content

Commit

Permalink
Updated to Swift 5, updates pods, and builds for Xcode 12 (#15)
Browse files Browse the repository at this point in the history
  • Loading branch information
dtaylor1701 authored Oct 2, 2020
1 parent 5e59a61 commit dc3e22a
Show file tree
Hide file tree
Showing 138 changed files with 1,548 additions and 3,520 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0
5.0
20 changes: 7 additions & 13 deletions Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,17 @@ target 'StyledText_Example' do

target 'StyledText_Tests' do
inherit! :search_paths
pod 'Nimble', '~> 8.0.5'
pod 'Nimble'
pod 'Quick'
pod 'FBSnapshotTestCase', '~> 2.1.4'
pod 'Nimble-Snapshots', '~> 8.1.1'
pod 'iOSSnapshotTestCase'
pod 'Nimble-Snapshots'
end
end

# Hack until `swift_version` is added to the podspec https://github.com/CocoaPods/CocoaPods/issues/7134
swift4 = ['FBSnapshotTestCase']

post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = ''
if swift4.include?(target.name)
config.build_settings['SWIFT_VERSION'] = swift_version = '4.0'
end
end
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '10.0'
end
end
end
37 changes: 15 additions & 22 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,33 +1,27 @@
PODS:
- FBSnapshotTestCase (2.1.4):
- FBSnapshotTestCase/SwiftSupport (= 2.1.4)
- FBSnapshotTestCase/Core (2.1.4)
- FBSnapshotTestCase/SwiftSupport (2.1.4):
- FBSnapshotTestCase/Core
- iOSSnapshotTestCase (6.2.0):
- iOSSnapshotTestCase/SwiftSupport (= 6.2.0)
- iOSSnapshotTestCase/Core (6.2.0)
- iOSSnapshotTestCase/SwiftSupport (6.2.0):
- iOSSnapshotTestCase/Core
- Nimble (8.0.5)
- Nimble-Snapshots (8.1.1):
- Nimble-Snapshots/Core (= 8.1.1)
- Nimble-Snapshots/Core (8.1.1):
- Nimble (8.1.2)
- Nimble-Snapshots (8.2.1):
- Nimble-Snapshots/Core (= 8.2.1)
- Nimble-Snapshots/Core (8.2.1):
- iOSSnapshotTestCase (~> 6.0)
- Nimble (~> 8.0)
- Quick (1.2.0)
- StyledText (1.2.0)
- Quick (3.0.0)
- StyledText (1.3.0)

DEPENDENCIES:
- FBSnapshotTestCase (~> 2.1.4)
- Nimble (~> 8.0.5)
- Nimble-Snapshots (~> 8.1.1)
- iOSSnapshotTestCase
- Nimble
- Nimble-Snapshots
- Quick
- StyledText (from `../`)

SPEC REPOS:
trunk:
- FBSnapshotTestCase
- iOSSnapshotTestCase
- Nimble
- Nimble-Snapshots
Expand All @@ -38,13 +32,12 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
iOSSnapshotTestCase: 9ab44cb5aa62b84d31847f40680112e15ec579a6
Nimble: 4ab1aeb9b45553c75b9687196b0fa0713170a332
Nimble-Snapshots: 5058fb9b459e64371f54a0f8d9dde6f33db490a0
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
StyledText: beae3735c7519bb41b62763eb88aa31d17fc8243
Nimble: 3864815b4703c7ebffba875973c70e854489fbae
Nimble-Snapshots: 3a4750d83752625c8ebfdc588da105303ee2201e
Quick: 6d9559f40647bc4d510103842ef2fdd882d753e2
StyledText: f1f3da3cb2151c2821d7b84a462bb57d22eb0b33

PODFILE CHECKSUM: 3651a54dfc5a4b87eaeda450dfb810881dcebde4
PODFILE CHECKSUM: c81093a63a3ec0078b3e3bb558a994249613c555

COCOAPODS: 1.9.0
COCOAPODS: 1.9.1

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit dc3e22a

Please sign in to comment.