-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #64 from Kaiede/vNext
Prep 1.0 for Release
- Loading branch information
Showing
50 changed files
with
2,566 additions
and
1,740 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| // See https://go.microsoft.com/fwlink/?LinkId=733558 | ||
| // for the documentation about the tasks.json format | ||
| "version": "2.0.0", | ||
| "tasks": [ | ||
| { | ||
| "label": "build", | ||
| "type": "shell", | ||
| "command": "swift", | ||
| "args": [ | ||
| "test" | ||
| ], | ||
| "group": { | ||
| "kind": "build", | ||
| "isDefault": true | ||
| }, | ||
| "presentation": { | ||
| "reveal": "always", | ||
| "clear": true | ||
| } | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,46 @@ | ||
| // swift-tools-version:3.1 | ||
| // swift-tools-version:4.0 | ||
| // The swift-tools-version declares the minimum version of Swift required to build this package. | ||
|
|
||
| import PackageDescription | ||
|
|
||
| // | ||
| // Backport of Package(url:from:) | ||
| // | ||
| extension Package.Dependency { | ||
| public class func Package(url: String, from versionString: String) -> Package.Dependency { | ||
| guard let version = Version(versionString) else { fatalError() } | ||
| let nextMajor = Version(version.major + 1, 0, 0) | ||
| return Package(url: url, versions: version..<nextMajor) | ||
| } | ||
| } | ||
|
|
||
| // | ||
| // Package | ||
| // | ||
| let package = Package( | ||
| name: "RPiLight", | ||
| targets: [ | ||
| Target( | ||
| name: "RPiLight", | ||
| dependencies: ["Core"] | ||
| ), | ||
| Target( | ||
| name: "Core", | ||
| dependencies: ["PWM", "Logging"] | ||
| ), | ||
| Target( | ||
| name: "PWM", | ||
| dependencies: ["Logging"] | ||
| ), | ||
| Target(name: "Logging") | ||
| products: [ | ||
| // Products define the executables and libraries produced by a package, and make them visible to other packages. | ||
| .executable( | ||
| name: "RPiLight", | ||
| targets: ["RPiLight"]), | ||
| ], | ||
| dependencies: [ | ||
| .Package(url: "https://github.com/Kaiede/Ephemeris.git", from: "1.0.0"), | ||
| .Package(url: "https://github.com/kareman/Moderator.git", from: "0.5.0"), | ||
| .Package(url: "https://github.com/Kaiede/PCA9685.git", from: "2.0.0"), | ||
| .Package(url: "https://github.com/Kaiede/SingleBoard.git", from: "0.2.0"), | ||
| .Package(url: "https://github.com/IBM-Swift/SwiftyJSON.git", from: "17.0.2") | ||
| // Dependencies declare other packages that this package depends on. | ||
| .package(url: "https://github.com/Kaiede/Ephemeris.git", from: "1.0.2"), | ||
| .package(url: "https://github.com/Kaiede/Moderator.git", .branch("swift5compat")), // Need merging | ||
| .package(url: "https://github.com/Kaiede/PCA9685.git", from: "3.0.0"), | ||
| .package(url: "https://github.com/Kaiede/MCP4725.git", from: "0.1.0"), | ||
| .package(url: "https://github.com/Kaiede/SingleBoard.git", from: "1.0.0") | ||
| ], | ||
| swiftLanguageVersions: [3, 4] | ||
| 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: "RPiLight", | ||
| dependencies: ["Service", "Moderator"]), | ||
| .target( | ||
| name: "Service", | ||
| dependencies: ["LED", "Logging", "Ephemeris"]), | ||
| .target( | ||
| name: "LED", | ||
| dependencies: ["Logging", "MCP4725", "PCA9685", "SingleBoard"]), | ||
| .target(name: "Logging"), | ||
|
|
||
| // Test Targets | ||
| .testTarget( | ||
| name: "ServiceTests", | ||
| dependencies: ["Service"] | ||
| ), | ||
| .testTarget( | ||
| name: "LEDTests", | ||
| dependencies: ["LED"] | ||
| ) | ||
| ] | ||
| ) |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.