Skip to content

Commit c3450d1

Browse files
yaroslav-zhurakovskiyfulldecent
authored andcommitted
Swift 5 layout (#119)
* 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
1 parent 7ba2079 commit c3450d1

Some content is hidden

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

49 files changed

+768
-848
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
#
33
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
44

5+
# OS X
6+
.DS_Store
7+
58
## Build generated
69
build/
710
DerivedData/
@@ -36,6 +39,7 @@ playground.xcworkspace
3639
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
3740
# Packages/
3841
.build/
42+
.swiftpm
3943

4044
# CocoaPods
4145
#

.travis.yml

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,14 @@
11
language: objective-c
2-
osx_image: xcode8
2+
osx_image: xcode11.2
33
env:
44
global:
5-
- LC_CTYPE=en_US.UTF-8
6-
- LANG=en_US.UTF-8
7-
- WORKSPACE="FDTake.xcworkspace"
8-
- IOS_FRAMEWORK_SCHEME="FDTake"
9-
- IOS_SDK=iphonesimulator10.0
10-
- EXAMPLE_SCHEME="iOS Example"
5+
- LC_CTYPE=en_US.UTF-8
6+
- LANG=en_US.UTF-8
7+
- RUN_TESTS="YES"
8+
- BUILD_EXAMPLE="YES"
9+
- POD_LINT="NO"
10+
- POD_QUALITY_CHECK="NO"
1111
matrix:
12-
- DESTINATION="OS=10.0,name=iPhone 7 Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" POD_LINT="NO"
12+
- DESTINATION="OS=13.2.2,name=iPhone 8 Plus"
1313
script:
14-
- set -o pipefail
15-
- xcodebuild -version
16-
- xcodebuild -showsdks
17-
- xcodebuild -list
18-
- xcodebuild -workspace "$WORKSPACE" -list
19-
20-
# Build and test Framework in Debug
21-
- xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty
22-
23-
# Build Framework in ReleaseTest
24-
- xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration ReleaseTest ONLY_ACTIVE_ARCH=NO build | xcpretty
25-
26-
# Build Example in Debug if specified
27-
- xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty
28-
29-
# Run `pod lib lint` if specified
30-
- if [ $POD_LINT == "YES" ]; then
31-
pod lib lint;
32-
fi
33-
34-
- ruby Tests/CheckCocoaPodsQualityIndexes.rb FDTake
14+
- Scripts/travis-ci.sh

FDTake.podspec

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ Pod::Spec.new do |s|
1414
s.platform = :ios, '10.0'
1515
s.requires_arc = true
1616
s.swift_version = '5.0'
17-
s.source_files = 'Source/*.{h,m,swift}','Source/*.swift'
18-
s.resource = 'Source/*.lproj/*'
17+
s.source_files = 'Sources/FDTake/**/*.swift'
18+
s.resource_bundles = {
19+
'Resources' => [
20+
'Sources/FDTake/Resources/*.lproj'
21+
]
22+
}
1923
end

0 commit comments

Comments
 (0)