Skip to content

Commit

Permalink
Merge pull request #210 from layoutBox/fix_podspec_for_swift_5.1.1
Browse files Browse the repository at this point in the history
Update the podspec to support all Swift versions
  • Loading branch information
lucdion authored Oct 31, 2019
2 parents 7455588 + e48fe63 commit 930593a
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode11
osx_image: xcode11.2

cache:
- bundler
Expand Down
3 changes: 1 addition & 2 deletions PinLayout.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@

Pod::Spec.new do |spec|
spec.name = "PinLayout"
spec.version = "1.8.12"
spec.version = "1.8.13"
spec.summary = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast."
spec.description = "Fast Swift Views layouting without auto layout. No magic, pure code, full control and blazing fast. Concise syntax, intuitive, readable & chainable. [iOS/macOS/tvOS/CALayer]"
spec.homepage = "https://github.com/layoutBox/PinLayout"
spec.license = "MIT license"
spec.author = { "Luc Dion" => "luc_dion@yahoo.com" }
spec.source = { :git => "https://github.com/layoutBox/PinLayout.git", :tag => "#{spec.version}" }
spec.source_files = "Sources/**/*.swift"
spec.swift_version = ['4.2', '5.0', '5.1']

spec.ios.deployment_target = '8.0'
spec.ios.frameworks = 'Foundation', 'CoreGraphics', 'UIKit'
Expand Down
40 changes: 20 additions & 20 deletions build-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ echo "===============================" &&
echo "PinLayout-iOS" &&
echo "===============================" &&
time xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-iOS \
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator13.0 \
-destination 'platform=iOS Simulator,name=iPhone 8,OS=13.0' \
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator13.2 \
-destination 'platform=iOS Simulator,name=iPhone 8,OS=13.2' \
| xcpretty &&

echo "===============================" &&
echo "PinLayout-tvOS" &&
echo "===============================" &&
time xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-tvOS \
-derivedDataPath $DERIVED_DATA -sdk appletvsimulator13.0 \
-destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=13.0' \
-derivedDataPath $DERIVED_DATA -sdk appletvsimulator13.2 \
-destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=13.2' \
| xcpretty &&

echo "===============================" &&
Expand All @@ -31,39 +31,39 @@ echo "===============================" &&
echo "PinLayoutSample" &&
echo "===============================" &&
time xcodebuild build -workspace PinLayout.xcworkspace -scheme PinLayoutSample \
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator13.0 \
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator13.2 \
-destination 'platform=iOS Simulator,name=iPhone 7,OS=11.4' \
| xcpretty &&

echo "===============================" &&
echo "iOS unit test" &&
echo "===============================" &&
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator13.0 \
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator13.2 \
-destination 'platform=iOS Simulator,name=iPhone 7,OS=11.4' \
| xcpretty &&

time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator13.0 \
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator13.2 \
-destination 'platform=iOS Simulator,name=iPhone 8,OS=12.2' \
| xcpretty &&

time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator13.0 \
-destination 'platform=iOS Simulator,name=iPhone 8,OS=13.0' \
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator13.2 \
-destination 'platform=iOS Simulator,name=iPhone 8,OS=13.2' \
| xcpretty &&

# echo "==============================="
# echo "tvOS unit test"
# echo "==============================="
# time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS \
# -derivedDataPath $DERIVED_DATA -sdk appletvsimulator13.0 \
# -derivedDataPath $DERIVED_DATA -sdk appletvsimulator13.2 \
# -destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=12.2' \
# | xcpretty

# time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-tvOS \
# -derivedDataPath $DERIVED_DATA -sdk appletvsimulator13.0 \
# -destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=13.0' \
# -derivedDataPath $DERIVED_DATA -sdk appletvsimulator13.2 \
# -destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=13.2' \
# | xcpretty

# echo "==============================="
Expand All @@ -80,8 +80,8 @@ cd TestProjects/cocoapods/ios &&
rm -rf $DERIVED_DATA &&
pod install &&
time xcodebuild clean build -workspace PinLayout-iOS.xcworkspace -scheme PinLayout-iOS \
-sdk iphonesimulator13.0 -derivedDataPath $DERIVED_DATA \
-destination 'platform=iOS Simulator,name=iPhone 8,OS=13.0' \
-sdk iphonesimulator13.2 -derivedDataPath $DERIVED_DATA \
-destination 'platform=iOS Simulator,name=iPhone 8,OS=13.2' \
| xcpretty &&
cd ../../.. &&

Expand All @@ -105,8 +105,8 @@ cd TestProjects/cocoapods/tvos &&
rm -rf $DERIVED_DATA &&
pod install &&
time xcodebuild clean build -workspace PinLayout-tvOS.xcworkspace -scheme PinLayout-tvOS \
-sdk appletvsimulator13.0 -derivedDataPath $DERIVED_DATA \
-destination 'platform=tvOS Simulator,name=Apple TV,OS=13.0' \
-sdk appletvsimulator13.2 -derivedDataPath $DERIVED_DATA \
-destination 'platform=tvOS Simulator,name=Apple TV,OS=13.2' \
| xcpretty &&
cd ../../.. &&

Expand All @@ -120,9 +120,9 @@ rm Cartfile &&
echo "git \"$TRAVIS_BUILD_DIR\" \"$TRAVIS_BRANCH\"" > Cartfile &&
carthage update --use-ssh --platform iOS &&
time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj \
-scheme PinLayout-Carthage-iOS -sdk iphonesimulator13.0 \
-scheme PinLayout-Carthage-iOS -sdk iphonesimulator13.2 \
-derivedDataPath $DERIVED_DATA \
-destination 'platform=iOS Simulator,name=iPhone 8,OS=13.0' \
-destination 'platform=iOS Simulator,name=iPhone 8,OS=13.2' \
| xcpretty &&
cd ../../.. &&

Expand All @@ -139,8 +139,8 @@ time bundle exec pod lib lint --allow-warnings
# rm -rf .build
# rm Package.pins
# swift package show-dependencies --format json
# time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj -scheme PinLayout-Carthage-iOS -sdk iphonesimulator13.0 -derivedDataPath $DERIVED_DATA \
# -destination 'platform=iOS Simulator,name=iPhone 8,OS=13.0' \
# time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj -scheme PinLayout-Carthage-iOS -sdk iphonesimulator13.2 -derivedDataPath $DERIVED_DATA \
# -destination 'platform=iOS Simulator,name=iPhone 8,OS=13.2' \
# | xcpretty
# cd ../../..
#
Expand Down

0 comments on commit 930593a

Please sign in to comment.