diff --git a/Application/RubiconApp.xcodeproj/project.pbxproj b/Application/RubiconApp.xcodeproj/project.pbxproj index 858c7ed..2c2840d 100644 --- a/Application/RubiconApp.xcodeproj/project.pbxproj +++ b/Application/RubiconApp.xcodeproj/project.pbxproj @@ -319,7 +319,7 @@ "DEVELOPMENT_TEAM[sdk=macosx*]" = 473264X5JK; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = RubiconExtension/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = RubiconExtension; + INFOPLIST_KEY_CFBundleDisplayName = Rubicon; INFOPLIST_KEY_NSHumanReadableCopyright = ""; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -350,7 +350,7 @@ "DEVELOPMENT_TEAM[sdk=macosx*]" = 473264X5JK; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = RubiconExtension/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = RubiconExtension; + INFOPLIST_KEY_CFBundleDisplayName = Rubicon; INFOPLIST_KEY_NSHumanReadableCopyright = ""; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/Sources/Rubicon/Generator/SpyGenerator.swift b/Sources/Rubicon/Generator/SpyGenerator.swift index 5c5268f..cd97bdb 100644 --- a/Sources/Rubicon/Generator/SpyGenerator.swift +++ b/Sources/Rubicon/Generator/SpyGenerator.swift @@ -71,7 +71,7 @@ final class SpyGenerator { var variables = [VarDeclaration]() if declaration.isThrowing { - let throwBlockType = TypeDeclaration(name: "(() -> Void)?", isOptional: true, prefix: [.escaping]) + let throwBlockType = TypeDeclaration(name: "(() throws -> Void)?", isOptional: true, prefix: [.escaping]) variables.append(VarDeclaration(isConstant: false, identifier: name + "ThrowBlock", type: throwBlockType)) } diff --git a/Sources/Rubicon/Generator/StubGenerator.swift b/Sources/Rubicon/Generator/StubGenerator.swift index d43ba90..090f78e 100644 --- a/Sources/Rubicon/Generator/StubGenerator.swift +++ b/Sources/Rubicon/Generator/StubGenerator.swift @@ -59,7 +59,7 @@ final class StubGenerator { var variables = [VarDeclaration]() if declaration.isThrowing { - let throwBlockType = TypeDeclaration(name: "(() -> Void)?", isOptional: true, prefix: [.escaping]) + let throwBlockType = TypeDeclaration(name: "(() throws -> Void)?", isOptional: true, prefix: [.escaping]) variables.append(VarDeclaration(isConstant: false, identifier: name + "ThrowBlock", type: throwBlockType)) } diff --git a/Tests/RubiconTests/Generator/SpyGeneratorTests.swift b/Tests/RubiconTests/Generator/SpyGeneratorTests.swift index f158fa0..621e340 100644 --- a/Tests/RubiconTests/Generator/SpyGeneratorTests.swift +++ b/Tests/RubiconTests/Generator/SpyGeneratorTests.swift @@ -157,7 +157,7 @@ final class SpyGeneratorTests: XCTestCase { XCTAssertEqual(variableGeneratorSpy.makeCode.count, 2) XCTAssertEqual(variableGeneratorSpy.makeCode.first?.declaration.identifier, "functionNameThrowBlock") - XCTAssertEqual(variableGeneratorSpy.makeCode.first?.declaration.type, .makeStub(name: "(() -> Void)?", isOptional: true, prefix: [.escaping])) + XCTAssertEqual(variableGeneratorSpy.makeCode.first?.declaration.type, .makeStub(name: "(() throws -> Void)?", isOptional: true, prefix: [.escaping])) XCTAssertEqual(variableGeneratorSpy.makeCode.first?.declaration.isConstant, false) XCTAssertEqual(variableGeneratorSpy.makeCode.last?.declaration.identifier, "functionNameReturn") XCTAssertEqual(variableGeneratorSpy.makeCode.last?.declaration.type, returnType) diff --git a/Tests/RubiconTests/Generator/StubGeneratorTests.swift b/Tests/RubiconTests/Generator/StubGeneratorTests.swift index 454ce4d..0816589 100644 --- a/Tests/RubiconTests/Generator/StubGeneratorTests.swift +++ b/Tests/RubiconTests/Generator/StubGeneratorTests.swift @@ -145,7 +145,7 @@ final class StubGeneratorTests: XCTestCase { XCTAssertEqual(variableGeneratorSpy.makeCode.count, 2) XCTAssertEqual(variableGeneratorSpy.makeCode.first?.declaration.identifier, "functionNameThrowBlock") - XCTAssertEqual(variableGeneratorSpy.makeCode.first?.declaration.type, .makeStub(name: "(() -> Void)?", isOptional: true, prefix: [.escaping])) + XCTAssertEqual(variableGeneratorSpy.makeCode.first?.declaration.type, .makeStub(name: "(() throws -> Void)?", isOptional: true, prefix: [.escaping])) XCTAssertEqual(variableGeneratorSpy.makeCode.first?.declaration.isConstant, false) XCTAssertEqual(variableGeneratorSpy.makeCode.last?.declaration.identifier, "functionNameReturn") XCTAssertEqual(variableGeneratorSpy.makeCode.last?.declaration.type, returnType) diff --git a/Tests/RubiconTests/Integration/SpyIntegrationTests.swift b/Tests/RubiconTests/Integration/SpyIntegrationTests.swift index 731fb20..05b3516 100644 --- a/Tests/RubiconTests/Integration/SpyIntegrationTests.swift +++ b/Tests/RubiconTests/Integration/SpyIntegrationTests.swift @@ -33,10 +33,10 @@ final class SpyIntegrationTests: XCTestCase { "-var name: String?", "-var color: Int", "", - "-var loadThrowBlock: (() -> Void)?", + "-var loadThrowBlock: (() throws -> Void)?", "-var loadReturn: Int", "-var isFullReturn: Bool", - "-var downloadThrowBlock: (() -> Void)?", + "-var downloadThrowBlock: (() throws -> Void)?", "-var downloadReturn: [String]", "-var goCount = 0", "-var load = [Load]()", diff --git a/Tests/RubiconTests/Integration/StubIntegrationTests.swift b/Tests/RubiconTests/Integration/StubIntegrationTests.swift index 74b1628..6955c82 100644 --- a/Tests/RubiconTests/Integration/StubIntegrationTests.swift +++ b/Tests/RubiconTests/Integration/StubIntegrationTests.swift @@ -22,10 +22,10 @@ final class StubIntegrationTests: XCTestCase { "final class CarStub: Car {", "-var name: String?", "-var color: Int", - "-var loadThrowBlock: (() -> Void)?", + "-var loadThrowBlock: (() throws -> Void)?", "-var loadReturn: Int", "-var isFullReturn: Bool", - "-var downloadThrowBlock: (() -> Void)?", + "-var downloadThrowBlock: (() throws -> Void)?", "-var downloadReturn: [String]", "", "-init(color: Int, loadReturn: Int, isFullReturn: Bool, downloadReturn: [String]) {",