diff --git a/.gitmodules b/.gitmodules index b7d2aef..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +0,0 @@ -[submodule "Carthage/Checkouts/KIF"] - path = Carthage/Checkouts/KIF - url = https://github.com/kif-framework/KIF.git -[submodule "Carthage/Checkouts/OHHTTPStubs"] - path = Carthage/Checkouts/OHHTTPStubs - url = https://github.com/AliSoftware/OHHTTPStubs.git -[submodule "Carthage/Checkouts/SimulatorStatusMagic"] - path = Carthage/Checkouts/SimulatorStatusMagic - url = https://github.com/shinydevelopment/SimulatorStatusMagic.git diff --git a/CHANGELOG.md b/CHANGELOG.md index ce33022..88f24fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,13 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased](https://github.com/openium/SwiftiumTestingKit/compare/v0.6.0...HEAD) ### Added +Swift Package Manager support -### Changed +### Changed ### Removed +Carthage support +SimulatorStatusBarMagic ## [0.6.2](https://github.com/openium/SwiftiumTestingKit/compare/v0.6.2...v0.6.1) ### Added diff --git a/Cartfile b/Cartfile deleted file mode 100644 index 111628e..0000000 --- a/Cartfile +++ /dev/null @@ -1,3 +0,0 @@ -github "kif-framework/KIF" ~> 3.7 -github "shinydevelopment/SimulatorStatusMagic" "ios13" -github "AliSoftware/OHHTTPStubs" ~> 7.0 diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index 430f482..0000000 --- a/Cartfile.resolved +++ /dev/null @@ -1,3 +0,0 @@ -github "AliSoftware/OHHTTPStubs" "7.0.0" -github "kif-framework/KIF" "v3.7.8" -github "shinydevelopment/SimulatorStatusMagic" "82529f682e0b988d3c115b9e98e9ff77f3215798" diff --git a/Carthage/Checkouts/KIF b/Carthage/Checkouts/KIF deleted file mode 160000 index 0ea470b..0000000 --- a/Carthage/Checkouts/KIF +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0ea470b4731c95782d9a34342efbf5de3ec23183 diff --git a/Carthage/Checkouts/OHHTTPStubs b/Carthage/Checkouts/OHHTTPStubs deleted file mode 160000 index 5431829..0000000 --- a/Carthage/Checkouts/OHHTTPStubs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 543182991a0d59db81f5b835a40901a9a386847d diff --git a/Carthage/Checkouts/SimulatorStatusMagic b/Carthage/Checkouts/SimulatorStatusMagic deleted file mode 160000 index 82529f6..0000000 --- a/Carthage/Checkouts/SimulatorStatusMagic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 82529f682e0b988d3c115b9e98e9ff77f3215798 diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..c2e26a3 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,25 @@ +{ + "object": { + "pins": [ + { + "package": "KIF", + "repositoryURL": "https://github.com/openium/KIF", + "state": { + "branch": "master", + "revision": "f37d791f40f6f112b288eba967e1c1386fbe598b", + "version": null + } + }, + { + "package": "OHHTTPStubs", + "repositoryURL": "https://github.com/AliSoftware/OHHTTPStubs", + "state": { + "branch": null, + "revision": "e92b5a5746ef16add2a1424f1fc19529d9a75cde", + "version": "9.0.0" + } + } + ] + }, + "version": 1 +} diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..cdb0076 --- /dev/null +++ b/Package.swift @@ -0,0 +1,36 @@ +// swift-tools-version:5.2 +// The swift-tools-version declares the minimum version of Swift required to build this package. +// https://github.com/apple/swift-package-manager/blob/master/Documentation/Usage.md + +import PackageDescription + +let package = Package( + name: "SwiftiumTestingKit", + platforms: [ + .iOS(.v10) + ], + products: [ + // Products define the executables and libraries produced by a package, and make them visible to other packages. + .library( + name: "SwiftiumTestingKit", + targets: ["SwiftiumTestingKit"]), + ], + dependencies: [ + // Dependencies declare other packages that this package depends on. + .package(url: "https://github.com/AliSoftware/OHHTTPStubs", from: "9.0.0"), + .package(url: "https://github.com/openium/KIF", .branch("master")), + ], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages which this package depends on. + .target( + name: "SwiftiumTestingKit", + dependencies: [ + .product(name: "OHHTTPStubsSwift", package: "OHHTTPStubs"), + "KIF", + ]), + .testTarget( + name: "SwiftiumTestingKitTests", + dependencies: ["SwiftiumTestingKit"]), + ] +) diff --git a/README.md b/README.md index 82b5c45..15b493f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -# SwiftiumKit - -[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) +# SwiftiumTestingKit This "Kit" adds many feature to speed up iOS app testing. It allows to write Unit tests for testing view controllers "quicker than UI Tests". @@ -26,34 +24,16 @@ see more in [STKSoloTests.swift](https://github.com/openium/SwiftiumTestingKit/b ## Installation -### Carthage - -[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks. - -You can install Carthage with [Homebrew](https://brew.sh/) using the following command: - -```bash -$ brew update -$ brew install carthage -``` +### Swift Package Manager -To integrate Alamofire into your Xcode project using Carthage, specify it in your `Cartfile`: - -```ogdl -github "openium/SwiftiumTestingKit" ~> latest -``` - -Run `carthage update` to build the framework and drag the built `SwiftiumTestingKit.framework` into your Xcode project. +See [official documentation](https://github.com/apple/swift-package-manager/tree/master/Documentation) ### Setup -Add the following frameworks to your test target and add a `Copy Files` with `frameworks` destimations to your test target build phases: -- `SimulatorStatusMagiciOS.framework` -- `OHHTTPStubs.framework` -- `SwiftiumTestingKit.framework` -- `KIF.framework` - -![](doc/copy-frameworks.png) +Add the following libraries to your test target : +- `OHHTTPStubs` +- `SwiftiumTestingKit` +- `KIF` # To be done : diff --git a/STKTestApp/ViewController.xib b/STKTestApp/ViewController.xib index e615254..ed607df 100644 --- a/STKTestApp/ViewController.xib +++ b/STKTestApp/ViewController.xib @@ -1,9 +1,9 @@ - + - + @@ -23,14 +23,14 @@ -