Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Swift Package Manager with Xcode #672

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
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 @@ -32,6 +32,7 @@ playground.xcworkspace

# Swift Package Manager
.build/
.swiftpm/

# Carthage
Carthage
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: swift
osx_image: xcode10.2
osx_image: xcode11.3

cache:
directories:
Expand All @@ -14,16 +14,15 @@ jobs:
include:
- stage: "Xcode"
name: "Run tests on iOS"
script: xcrun xcodebuild test -destination "platform=iOS Simulator,OS=12.2,name=iPhone X" -workspace "Bond.xcworkspace" -scheme "Bond-iOS"
script: xcrun xcodebuild test -destination "platform=iOS Simulator,OS=13.3,name=iPhone 11" -workspace "Bond.xcworkspace" -scheme "Bond-iOS"
after_success: 'bash <(curl -s https://codecov.io/bash)'
-
name: "Build for macOS"
script: xcrun xcodebuild build -destination "platform=macOS" -workspace "Bond.xcworkspace" -scheme "Bond-macOS"
-
name: "Build for tvOS"
script: xcrun xcodebuild build -destination "platform=tvOS Simulator,OS=12.2,name=Apple TV 4K" -workspace "Bond.xcworkspace" -scheme "Bond-tvOS"
script: xcrun xcodebuild build -destination "platform=tvOS Simulator,OS=13.3,name=Apple TV 4K" -workspace "Bond.xcworkspace" -scheme "Bond-tvOS"

- stage: "Swift Package Manager"
name: "Run Tests"
script: swift test

script: swift test --enable-test-discovery
4 changes: 2 additions & 2 deletions Bond.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ Pod::Spec.new do |s|
s.osx.exclude_files = "Sources/Bond/UIKit"
s.pod_target_xcconfig = { "OTHER_SWIFT_FLAGS" => "-DBUILDING_WITH_XCODE $(inherited)" }
s.requires_arc = true
s.swift_version = '5.0'
s.swift_version = '5.1'

s.dependency "ReactiveKit", "~> 3.14"
s.dependency "ReactiveKit", "~> 3.15"
s.dependency "Differ", "~> 1.4"

end
171 changes: 101 additions & 70 deletions Bond.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

25 changes: 25 additions & 0 deletions Bond.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"object": {
"pins": [
{
"package": "Differ",
"repositoryURL": "https://github.com/tonyarnold/Differ.git",
"state": {
"branch": null,
"revision": "dd5d4bfb1c27012d4790e877b29847d2ab9d989b",
"version": "1.4.4"
}
},
{
"package": "ReactiveKit",
"repositoryURL": "https://github.com/DeclarativeHub/ReactiveKit.git",
"state": {
"branch": null,
"revision": "a45f218217175e7c933acc82681ec8ce62ec55a4",
"version": "3.15.6"
}
}
]
},
"version": 1
}
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "DeclarativeHub/ReactiveKit" ~> 3.14
github "DeclarativeHub/ReactiveKit" ~> 3.15
github "tonyarnold/Differ" ~> 1.4
8 changes: 4 additions & 4 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
"repositoryURL": "https://github.com/tonyarnold/Differ.git",
"state": {
"branch": null,
"revision": "e2cca36e7258dd8add88ae46b5ea56509b066e21",
"version": "1.4.3"
"revision": "dd5d4bfb1c27012d4790e877b29847d2ab9d989b",
"version": "1.4.4"
}
},
{
"package": "ReactiveKit",
"repositoryURL": "https://github.com/DeclarativeHub/ReactiveKit.git",
"state": {
"branch": null,
"revision": "318d99599469a53b0e0fcf0eb975dba75501ede6",
"version": "3.14.2"
"revision": "a45f218217175e7c933acc82681ec8ce62ec55a4",
"version": "3.15.6"
}
}
]
Expand Down
6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.0
// swift-tools-version:5.1
import PackageDescription

let package = Package(
Expand All @@ -10,8 +10,8 @@ let package = Package(
.library(name: "Bond", targets: ["Bond"])
],
dependencies: [
.package(url: "https://github.com/DeclarativeHub/ReactiveKit.git", .upToNextMajor(from: "3.14.2")),
.package(url: "https://github.com/tonyarnold/Differ.git", .upToNextMajor(from: "1.4.3"))
.package(url: "https://github.com/DeclarativeHub/ReactiveKit.git", .upToNextMajor(from: "3.15.6")),
.package(url: "https://github.com/tonyarnold/Differ.git", .upToNextMajor(from: "1.4.4"))
],
targets: [
.target(name: "BNDProtocolProxyBase"),
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ If you have an extensions that makes your favourite framework work with Bond and
## Requirements

* iOS 8.0+ / macOS 10.11+ / tvOS 9.0+
* Swift 4.2
* Xcode 11 / Swift 5.1

## Communication

Expand Down Expand Up @@ -245,7 +245,7 @@ If you have an extensions that makes your favourite framework work with Bond and

The MIT License (MIT)

Copyright (c) 2015-2019 Srdan Rasic (@srdanrasic)
Copyright (c) 2015-2020 Srdan Rasic (@srdanrasic)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down