Skip to content
This repository has been archived by the owner on Dec 22, 2023. It is now read-only.

Feature Swift Package Manager support #207

Merged
merged 10 commits into from
Jan 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ Carthage

# SPM
.build/
*.xcodeproj
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0
5.3
12 changes: 8 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
os: osx
osx_image: xcode11.6
osx_image: xcode12.2
language: swift

script:
- set -o pipefail && xcodebuild -project Family.xcodeproj -scheme "Family-macOS" -sdk macosx -enableCodeCoverage YES clean build test | xcpretty
- set -o pipefail && swift --version
- set -o pipefail && swift package tools-version --set-current
- set -o pipefail && swift build
- set -o pipefail && swift package generate-xcodeproj
- set -o pipefail && xcodebuild -project Family.xcodeproj -scheme "Family-Package" -sdk macosx -enableCodeCoverage YES clean build test | xcpretty
- bash <(curl -s https://codecov.io/bash) -c -F macOS
- set -o pipefail && xcodebuild -project Family.xcodeproj -scheme "Family-tvOS" -destination 'name=Apple TV,OS=13.4' -enableCodeCoverage YES clean build test | xcpretty
- set -o pipefail && xcodebuild -project Family.xcodeproj -scheme "Family-Package" -destination 'name=Apple TV,OS=14.2' -enableCodeCoverage YES clean build test | xcpretty
- bash <(curl -s https://codecov.io/bash) -c -F tvOS
- set -o pipefail && xcodebuild -project Family.xcodeproj -scheme "Family-iOS" -sdk iphonesimulator -destination name="iPhone 8,OS=13.5" -enableCodeCoverage YES clean build test | xcpretty
- set -o pipefail && xcodebuild -project Family.xcodeproj -scheme "Family-Package" -sdk iphonesimulator -destination name="iPhone 8,OS=14.2" -enableCodeCoverage YES clean build test | xcpretty
- bash <(curl -s https://codecov.io/bash) -c -F iOS

notifications:
Expand Down
8 changes: 4 additions & 4 deletions Family.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "Family"
s.summary = "A child view controller framework that makes setting up your parent controllers as easy as pie."
s.version = "2.1.2"
s.version = "2.2.0"
s.homepage = "https://github.com/zenangst/Family"
s.license = 'MIT'
s.author = { "Christoffer Winterkvist" => "christoffer@winterkvist.com" }
Expand All @@ -17,9 +17,9 @@ Pod::Spec.new do |s|
s.tvos.deployment_target = '10.0'

s.requires_arc = true
s.ios.source_files = 'Sources/{iOS+tvOS,Shared}/**/*'
s.tvos.source_files = 'Sources/{iOS+tvOS,Shared}/**/*'
s.macos.source_files = 'Sources/{macOS,Shared}/**/*'
s.ios.source_files = 'Sources/{UIKit,Shared}/**/*'
s.tvos.source_files = 'Sources/{UIKit,Shared}/**/*'
s.macos.source_files = 'Sources/{AppKit,Shared}/**/*'

s.pod_target_xcconfig = { 'SWIFT_VERSION' => '5.0' }
end
1,199 changes: 0 additions & 1,199 deletions Family.xcodeproj/project.pbxproj

This file was deleted.

7 changes: 0 additions & 7 deletions Family.xcodeproj/project.xcworkspace/contents.xcworkspacedata

This file was deleted.

This file was deleted.

This file was deleted.

87 changes: 0 additions & 87 deletions Family.xcodeproj/xcshareddata/xcschemes/Family-iOS.xcscheme

This file was deleted.

101 changes: 0 additions & 101 deletions Family.xcodeproj/xcshareddata/xcschemes/Family-macOS.xcscheme

This file was deleted.

87 changes: 0 additions & 87 deletions Family.xcodeproj/xcshareddata/xcschemes/Family-tvOS.xcscheme

This file was deleted.

Loading