Skip to content

Commit

Permalink
Migrate to Xcode 11 and Swift Package Manager for managing dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
DenTelezhkin committed Jul 11, 2019
1 parent b330dda commit 7d69180
Show file tree
Hide file tree
Showing 8 changed files with 205 additions and 195 deletions.
31 changes: 11 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,19 @@
sudo: false
language: objective-c
os: osx
osx_image: xcode10.2

cache:
directories:
- Carthage

osx_image: xcode11
matrix:
include:
- env: ACTION=test_ios12 PLATFORM=iOS
- env: ACTION=test_ios11 PLATFORM=iOS
- env: ACTION=test_tvos12 PLATFORM=tvOS
- env: ACTION=test_tvos11 PLATFORM=tvOS
- env: ACTION=test_ios_swift4 PLATFORM=iOS
- env: ACTION=test_tvos_swift4 PLATFORM=tvOS
- env: ACTION=test_macos PLATFORM=macOS
- env: ACTION=build_watchos PLATFORM=watchOS
- env: ACTION=pod_lint PLATFORM=iOS
- env: ACTION=carthage_build PLATFORM=iOS
before_script:
- brew update
- brew outdated carthage || brew upgrade carthage
- carthage bootstrap --cache-builds --platform $PLATFORM
- env: ACTION=test_ios13
- env: ACTION=test_ios12
- env: ACTION=test_tvos13
- env: ACTION=test_tvos12
- env: ACTION=test_ios_swift4
- env: ACTION=test_tvos_swift4
- env: ACTION=test_macos
- env: ACTION=build_watchos
- env: ACTION=pod_lint
- env: ACTION=carthage_build
script:
- instruments -s devices # List all available simulators
- bundle exec fastlane $ACTION
Expand Down
1 change: 1 addition & 0 deletions Example/CRUD.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import Foundation
import SwiftyJSON
import TRON
import TRONSwiftyJSON

class User: JSONDecodable {
required init(json: JSON) {
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@ let package = Package(
dependencies: [
"TRON",
"SwiftyJSON"]),
.testTarget(name: "Tests", dependencies: ["TRON", "TRONSwiftyJSON", "RxTRON"])
// .testTarget(name: "Tests", dependencies: ["TRON", "TRONSwiftyJSON", "RxTRON"])
]
)
Loading

0 comments on commit 7d69180

Please sign in to comment.