Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux, Windows, macOS.
SPM-related refactoring
kabiroberaiefed4185e2dd
diff --git a/Supersign/.gitignore b/Supersign/.gitignorenew file mode 100644index 0000000..a29df59--- /dev/null+++ b/Supersign/.gitignore@@ -0,0 +1,2 @@+/Tests/SupersignTests/config/*+!/Tests/SupersignTests/config/config-template.jsondiff --git a/Supersign/Package.swift b/Supersign/Package.swiftindex 0db6f59..4c35b13 100644--- a/Supersign/Package.swift+++ b/Supersign/Package.swift@@ -58,6 +58,20 @@ let package = Package(],cSettings: cSettings),+ .testTarget(+ name: "SupersignTests",+ dependencies: [+ "Supersign",+ .product(name: "SuperutilsTestSupport", package: "SuperchargeCore")+ ],+ exclude: [+ "config/config-template.json",+ ],+ resources: [+ .copy("config/config.json"),+ .copy("config/test.app"),+ ]+ ),.target(name: "SupersignCLI",dependencies: [diff --git a/SupersignTests/Tests/SupersignDeveloperServicesTests.swift b/Supersign/Tests/SupersignTests/Tests/SupersignDeveloperServicesTests.swiftsimilarity index 90%rename from SupersignTests/Tests/SupersignDeveloperServicesTests.swiftrename to Supersign/Tests/SupersignTests/Tests/SupersignDeveloperServicesTests.swiftindex 375925f..51dbaed 100644--- a/SupersignTests/Tests/SupersignDeveloperServicesTests.swift+++ b/Supersign/Tests/SupersignTests/Tests/SupersignDeveloperServicesTests.swift@@ -7,6 +7,7 @@//import XCTest+import SuperutilsTestSupportimport Supersignclass SupersignDeveloperServicesTests: XCTestCase {@@ -15,6 +16,7 @@ class SupersignDeveloperServicesTests: XCTestCase {override func setUp() {super.setUp()+ _ = addMockSignerclient = .test()}@@ -29,11 +31,11 @@ class SupersignDeveloperServicesTests: XCTestCase {let teams = try XCTTry(client.sendTest(listTeams))let team = teams.first { $0.status == "active" && $0.memberships.contains { $0.platform == .iOS } }!- let bundle = Bundle(for: Self.self)- let source = try XCTUnwrap(bundle.url(forResource: "test", withExtension: "app"))+ let source = try XCTUnwrap(Bundle.module.url(forResource: "test", withExtension: "app"))let context = try XCTTry(SigningContext(udid: Config.current.udid,+ deviceName: SigningContext.hostName,teamID: team.id,client: client,signingInfoManager: MemoryBackedSigningInfoManager()diff --git a/SupersignTests/Tests/SupersignGrandSlamTests.swift b/Supersign/Tests/SupersignTests/Tests/SupersignGrandSlamTests.swiftsimilarity index 97%rename from SupersignTests/Tests/SupersignGrandSlamTests.swiftrename to Supersign/Tests/SupersignTests/Tests/SupersignGrandSlamTests.swiftindex 4517635..2a1fad2 100644--- a/SupersignTests/Tests/SupersignGrandSlamTests.swift+++ b/Supersign/Tests/SupersignTests/Tests/SupersignGrandSlamTests.swift@@ -7,6 +7,7 @@//import XCTest+import SuperutilsTestSupport@testable import Supersignclass TwoFactorAuthenticator: TwoFactorAuthDelegate {@@ -23,6 +24,7 @@ class SupersignGrandSlamTests: XCTestCase {override func setUp() {super.setUp()+ _ = addMockSignerclient = .test()authenticator = TwoFactorAuthenticator()}diff --git a/SupersignTests/Tests/SupersignSigningTests.swift b/Supersign/Tests/SupersignTests/Tests/SupersignSigningTests.swiftsimilarity index 92%rename from SupersignTests/Tests/SupersignSigningTests.swiftrename to Supersign/Tests/SupersignTests/Tests/SupersignSigningTests.swiftindex 4d0db38..6da3a70 100644--- a/SupersignTests/Tests/SupersignSigningTests.swift+++ b/Supersign/Tests/SupersignTests/Tests/SupersignSigningTests.swift@@ -6,7 +6,12 @@// Copyright © 2019 Kabir Oberai. All rights reserved.//+// TODO: Test using mock signer++#if false+import XCTest+import SuperutilsTestSupportimport Supersignclass SupersignSigningTests: XCTestCase {@@ -18,11 +23,11 @@ class SupersignSigningTests: XCTestCase {// swiftlint:disable force_tryoverride func setUp() {super.setUp()+ _ = addMockSignerclient = .test()signerImpl = try! SignerImpl.first()- let bundle = Bundle(for: Self.self)- let source = try! XCTUnwrap(bundle.url(forResource: "test", withExtension: "app"))+ let source = try! XCTUnwrap(Bundle.module.url(forResource: "test", withExtension: "app"))let tmp = FileManager.default.temporaryDirectoryapp = tmp.appendingPathComponent(source.lastPathComponent)if FileManager.default.fileExists(atPath: app.path) {@@ -48,6 +53,7 @@ class SupersignSigningTests: XCTestCase {let context = try XCTTry(SigningContext(udid: Config.current.udid,+ deviceName: SigningContext.hostName,teamID: team.id,client: client,signingInfoManager: MemoryBackedSigningInfoManager(),@@ -82,3 +88,5 @@ class SupersignSigningTests: XCTestCase {}}++#endifdiff --git a/SupersignTests/Utilities/Config.swift b/Supersign/Tests/SupersignTests/Utilities/Config.swiftsimilarity index 85%rename from SupersignTests/Utilities/Config.swiftrename to Supersign/Tests/SupersignTests/Utilities/Config.swiftindex 94c86f8..7bc753d 100644--- a/SupersignTests/Utilities/Config.swift+++ b/Supersign/Tests/SupersignTests/Utilities/Config.swift@@ -23,8 +23,7 @@ struct Config: Decodable {let udid: Stringstatic let current: Config = {- class ConfigDummy {}- let url = Bundle(for: ConfigDummy.self).url(forResource: "config", withExtension: "json")!+ let url = Bundle.module.url(forResource: "config", withExtension: "json")!// swiftlint:disable:next force_trylet data = try! Data(contentsOf: url)// swiftlint:disable:next force_trydiff --git a/SupersignTests/Utilities/DeveloperServicesClient+Testing.swift b/Supersign/Tests/SupersignTests/Utilities/DeveloperServicesClient+Testing.swiftsimilarity index 98%rename from SupersignTests/Utilities/DeveloperServicesClient+Testing.swiftrename to Supersign/Tests/SupersignTests/Utilities/DeveloperServicesClient+Testing.swiftindex 838a24d..e7c1821 100644--- a/SupersignTests/Utilities/DeveloperServicesClient+Testing.swift+++ b/Supersign/Tests/SupersignTests/Utilities/DeveloperServicesClient+Testing.swift@@ -10,6 +10,8 @@ import Foundationimport XCTest@testable import Supersign+#if false+extension TCPAnisetteDataProvider {static func test() -> TCPAnisetteDataProvider {@@ -26,6 +28,8 @@ extension NetcatAnisetteDataProvider {}+#endif+extension SupersetteDataProvider {static func test() -> SupersetteDataProvider {diff --git a/Supersign/Tests/SupersignTests/Utilities/MockSigner.swift b/Supersign/Tests/SupersignTests/Utilities/MockSigner.swiftnew file mode 100644index 0000000..988a3df--- /dev/null+++ b/Supersign/Tests/SupersignTests/Utilities/MockSigner.swift@@ -0,0 +1,16 @@+import Foundation+import SignerSupport++let addMockSigner: () = {+ add_signer(+ "MockSigner",+ { appDir, certData, certLen, privKeyData, privKeyLen, entitlements, numEntitlements, progress, exception in+ exception.initialize(to: strdup("Mock signer not implemented"))+ return 1+ },+ { path, outLen, exception in+ exception.initialize(to: strdup("Mock analyzer not implemented"))+ return nil+ }+ )+}()diff --git a/SupersignTests/Utilities/ResultWaiter.swift b/Supersign/Tests/SupersignTests/Utilities/ResultWaiter.swiftsimilarity index 100%rename from SupersignTests/Utilities/ResultWaiter.swiftrename to Supersign/Tests/SupersignTests/Utilities/ResultWaiter.swiftdiff --git a/SupersignTests/config/config-template.json b/Supersign/Tests/SupersignTests/config/config-template.jsonsimilarity index 100%rename from SupersignTests/config/config-template.jsonrename to Supersign/Tests/SupersignTests/config/config-template.json