Skip to content

Commit

Permalink
Swift 5 layout (#119)
Browse files Browse the repository at this point in the history
* Add OS X specific files and SPM specific file to .gitignore

* Update project layout.

* Update README.md

* Update travis ci build

* Rework resources. Use a bundle instead of raw files.

* Switch from mac to ios deployment target for the resource bundle
  • Loading branch information
yaroslav-zhurakovskiy authored and fulldecent committed Nov 28, 2019
1 parent 7ba2079 commit c3450d1
Show file tree
Hide file tree
Showing 49 changed files with 768 additions and 848 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

# OS X
.DS_Store

## Build generated
build/
DerivedData/
Expand Down Expand Up @@ -36,6 +39,7 @@ playground.xcworkspace
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
.build/
.swiftpm

# CocoaPods
#
Expand Down
38 changes: 9 additions & 29 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,14 @@
language: objective-c
osx_image: xcode8
osx_image: xcode11.2
env:
global:
- LC_CTYPE=en_US.UTF-8
- LANG=en_US.UTF-8
- WORKSPACE="FDTake.xcworkspace"
- IOS_FRAMEWORK_SCHEME="FDTake"
- IOS_SDK=iphonesimulator10.0
- EXAMPLE_SCHEME="iOS Example"
- LC_CTYPE=en_US.UTF-8
- LANG=en_US.UTF-8
- RUN_TESTS="YES"
- BUILD_EXAMPLE="YES"
- POD_LINT="NO"
- POD_QUALITY_CHECK="NO"
matrix:
- DESTINATION="OS=10.0,name=iPhone 7 Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" POD_LINT="NO"
- DESTINATION="OS=13.2.2,name=iPhone 8 Plus"
script:
- set -o pipefail
- xcodebuild -version
- xcodebuild -showsdks
- xcodebuild -list
- xcodebuild -workspace "$WORKSPACE" -list

# Build and test Framework in Debug
- xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty

# Build Framework in ReleaseTest
- xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration ReleaseTest ONLY_ACTIVE_ARCH=NO build | xcpretty

# Build Example in Debug if specified
- xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty

# Run `pod lib lint` if specified
- if [ $POD_LINT == "YES" ]; then
pod lib lint;
fi

- ruby Tests/CheckCocoaPodsQualityIndexes.rb FDTake
- Scripts/travis-ci.sh
8 changes: 6 additions & 2 deletions FDTake.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ Pod::Spec.new do |s|
s.platform = :ios, '10.0'
s.requires_arc = true
s.swift_version = '5.0'
s.source_files = 'Source/*.{h,m,swift}','Source/*.swift'
s.resource = 'Source/*.lproj/*'
s.source_files = 'Sources/FDTake/**/*.swift'
s.resource_bundles = {
'Resources' => [
'Sources/FDTake/Resources/*.lproj'
]
}
end

0 comments on commit c3450d1

Please sign in to comment.