Update XCResultKit and sample app project for Xcode11.4

XCTestHTMLReport · Apr 21, 2020 · 2a38ab7 · 2a38ab7
1 parent 62fe4ed
commit 2a38ab7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/davidahouse/XCResultKit.git",
         "state": {
           "branch": null,
-          "revision": "b8cc1631ea91c9e8f9166d58ad607f0278f7553e",
-          "version": "0.5.7"
+          "revision": "d6632d454dabadf24ae79b1edc8a9942f49f513d",
+          "version": "0.6.0"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -10,7 +10,7 @@ let package = Package(
     ],
     dependencies: [
          .package(url: "https://github.com/onevcat/Rainbow.git", from: "3.0.0"),
-         .package(url: "https://github.com/davidahouse/XCResultKit.git", from: "0.5.7")
+         .package(url: "https://github.com/davidahouse/XCResultKit.git", from: "0.6.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

diff --git a/Sources/XCTestHTMLReport/Classes/Protocols/EmittableOutput.swift b/Sources/XCTestHTMLReport/Classes/Protocols/EmittableOutput.swift
@@ -28,7 +28,8 @@ extension ActivityLogSection: EmittableOutput {
 extension ActivityLogMajorSection: EmittableOutput {
 
     var emittedOutput: String? {
-        return "\(title) - \(subtitle)\n\n"
+        let t = [title, subtitle].compactMap { $0 }.joined(separator: " - ")
+        return "\(t)\n\n"
             + unitTestSubsections
                 .compactMap { $0.emittedOutput }
                 .joined(separator: "\n")

diff --git a/XCTestHTMLReportSampleApp/XCTestHTMLReportSampleApp.xcodeproj/project.pbxproj b/XCTestHTMLReportSampleApp/XCTestHTMLReportSampleApp.xcodeproj/project.pbxproj
@@ -202,13 +202,16 @@
 				TargetAttributes = {
 					F3AB01271F2459FA00334580 = {
 						CreatedOnToolsVersion = 9.0;
+						LastSwiftMigration = 1140;
 					};
 					F3AB013B1F2459FA00334580 = {
 						CreatedOnToolsVersion = 9.0;
+						LastSwiftMigration = 1140;
 						TestTargetID = F3AB01271F2459FA00334580;
 					};
 					F3C1FC551FECE3C30028EC72 = {
 						CreatedOnToolsVersion = 9.2;
+						LastSwiftMigration = 1140;
 						ProvisioningStyle = Automatic;
 						TestTargetID = F3AB01271F2459FA00334580;
 					};
@@ -445,7 +448,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tito.XCTestHTMLReportSampleApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -459,7 +462,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tito.XCTestHTMLReportSampleApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
@@ -473,7 +476,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tito.XCTestHTMLReportSampleAppUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_TARGET_NAME = XCTestHTMLReportSampleApp;
 			};
@@ -488,7 +491,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tito.XCTestHTMLReportSampleAppUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_TARGET_NAME = XCTestHTMLReportSampleApp;
 			};
@@ -505,7 +508,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tito.XCTestHTMLReportSampleAppUnitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XCTestHTMLReportSampleApp.app/XCTestHTMLReportSampleApp";
 			};
@@ -522,7 +525,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tito.XCTestHTMLReportSampleAppUnitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XCTestHTMLReportSampleApp.app/XCTestHTMLReportSampleApp";
 			};

diff --git a/XCTestHTMLReportSampleApp/XCTestHTMLReportSampleApp/AppDelegate.swift b/XCTestHTMLReportSampleApp/XCTestHTMLReportSampleApp/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }