Skip to content

Commit

Permalink
Merge pull request #100 from czechboy0/hd/xcode7_beta6_fixes
Browse files Browse the repository at this point in the history
xcode 7 beta 6 fixes
  • Loading branch information
Honza Dvorsky committed Aug 25, 2015
2 parents 1ab26ed + 8d634f0 commit f1d002a
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Podfile
Expand Up @@ -2,7 +2,7 @@
use_frameworks!

utils_name = 'BuildaUtils'
utils_version = '0.0.10'
utils_version = '0.0.11'

target 'XcodeServerSDK - OS X' do
pod utils_name, utils_version
Expand Down
6 changes: 3 additions & 3 deletions Podfile.lock
@@ -1,9 +1,9 @@
PODS:
- BuildaUtils (0.0.10)
- BuildaUtils (0.0.11)
- DVR (0.0.4-czechboy0)

DEPENDENCIES:
- BuildaUtils (= 0.0.10)
- BuildaUtils (= 0.0.11)
- DVR (from `https://github.com/czechboy0/DVR.git`, tag `v0.0.4-czechboy0`)

EXTERNAL SOURCES:
Expand All @@ -17,7 +17,7 @@ CHECKOUT OPTIONS:
:tag: v0.0.4-czechboy0

SPEC CHECKSUMS:
BuildaUtils: a6d3a5d27d4b96c86e4ce2ef6f2ba9d1ea32fa92
BuildaUtils: be29c9977230329a330a02c6f97454a7422ae534
DVR: 386f347071f55f3f9105239db6764483009ec875

COCOAPODS: 0.38.2
6 changes: 3 additions & 3 deletions XcodeServerSDK.podspec
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "XcodeServerSDK"
s.version = "0.1.9"
s.version = "0.1.10"
s.summary = "Access Xcode Server API with native Swift objects."

s.homepage = "https://github.com/czechboy0/XcodeServerSDK"
Expand All @@ -14,10 +14,10 @@ Pod::Spec.new do |s|
s.osx.deployment_target = "10.10"
s.watchos.deployment_target = "2.0"

s.source = { :git => "https://github.com/czechboy0/XcodeServerSDK.git", :tag => "v0.1.9" }
s.source = { :git => "https://github.com/czechboy0/XcodeServerSDK.git", :tag => "v0.1.10" }

s.source_files = "XcodeServerSDK/**/*.{swift}"

s.dependency "BuildaUtils", "0.0.10"
s.dependency "BuildaUtils", "0.0.11"

end
2 changes: 1 addition & 1 deletion XcodeServerSDK/XcodeServer.swift
Expand Up @@ -71,7 +71,7 @@ extension XcodeServer : NSURLSessionDelegate {

// MARK: Header constants
let Headers_APIVersion = "X-XCSAPIVersion"
let SupportedAPIVersion: Int = 5 //will change with time, this codebase supports this version
let SupportedAPIVersion: Int = 6 //will change with time, this codebase supports this version

// MARK: XcodeServer API methods
public extension XcodeServer {
Expand Down
2 changes: 1 addition & 1 deletion XcodeServerSDKTests/IntegrationTests.swift
Expand Up @@ -17,7 +17,7 @@ class IntegrationTests: XCTestCase {
let exp = self.expectationWithDescription("Network")
let server = self.getRecordingXcodeServer("get_integration")
server.getIntegration("ad2fac04895bd1bb06c1d50e3400fd35") { (integration, error) in
print()
print("")
exp.fulfill()
}
self.waitForExpectationsWithTimeout(10, handler: nil)
Expand Down
6 changes: 3 additions & 3 deletions XcodeServerSDKTests/XcodeServerConfigTests.swift
Expand Up @@ -54,7 +54,7 @@ class XcodeServerConfigTests: XCTestCase {

func testInvalidHostProvidingForManualInit() {
XCTempAssertThrowsSpecificError(ConfigurationErrors.InvalidHostProvided("Invalid host name provided, please double check your host name")) {
try XcodeServerConfig(host: "<>127.0.0.1", user: "ICanCreateBots", password: "superSecr3t")
_ = try XcodeServerConfig(host: "<>127.0.0.1", user: "ICanCreateBots", password: "superSecr3t")
}
}

Expand All @@ -81,13 +81,13 @@ class XcodeServerConfigTests: XCTestCase {
]

XCTempAssertThrowsSpecificError(ConfigurationErrors.NoHostProvided) {
try XcodeServerConfig(json: json)
_ = try XcodeServerConfig(json: json)
}
}

func testInvalidSchemeProvided() {
XCTempAssertThrowsSpecificError(ConfigurationErrors.InvalidSchemeProvided("Xcode Server generally uses https, please double check your hostname")) {
try XcodeServerConfig(host: "http://127.0.0.1")
_ = try XcodeServerConfig(host: "http://127.0.0.1")
}
}

Expand Down
8 changes: 4 additions & 4 deletions XcodeServerSDKTests/XcodeServerTests.swift
Expand Up @@ -52,7 +52,7 @@ class XcodeServerTests: XCTestCase {

let exp = self.expectationWithDescription("Network")
self.server.getBots { (bots, error) in
print()
print("")
exp.fulfill()
}
self.waitForExpectationsWithTimeout(10, handler: nil)
Expand All @@ -64,7 +64,7 @@ class XcodeServerTests: XCTestCase {
let server = self.getRecordingXcodeServer("test_bot")

server.getBots { (bots, error) in
print()
print("")
exp.fulfill()
}

Expand Down Expand Up @@ -94,13 +94,13 @@ class XcodeServerTests: XCTestCase {

self.server.createBot(bot) { (response) -> () in

print()
print("")
switch response {
case .Success(let newBot):

self.server.postIntegration(newBot.id) { (integration, error) -> () in

print()
print("")
exp.fulfill()
}

Expand Down

0 comments on commit f1d002a

Please sign in to comment.