Merge pull request #36 from nsoperations/release/0.40.2

Release/0.40.2

Makefile

@@ -1,11 +1,11 @@
 #!/usr/bin/xcrun make -f
 
-CARTHAGE_TEMPORARY_FOLDER?=/tmp/Carthage++.dst
+CARTHAGE_TEMPORARY_FOLDER?=/tmp/Carthage.dst
 PREFIX?=/usr/local
 CONFIGURATION?=release
 
 INTERNAL_PACKAGE=CarthageApp.pkg
-OUTPUT_PACKAGE=Carthage++.pkg
+OUTPUT_PACKAGE=Carthage.pkg
 
 CARTHAGE_EXECUTABLE=./.build/$(CONFIGURATION)/carthage
 BINARIES_FOLDER=/usr/local/bin
@@ -58,10 +58,10 @@ installables:
 
 package: installables
 	$(MKDIR) "$(CARTHAGE_TEMPORARY_FOLDER)$(BINARIES_FOLDER)"
-	$(CP) "$(CARTHAGE_EXECUTABLE)" "$(CARTHAGE_TEMPORARY_FOLDER)$(BINARIES_FOLDER)/carthage++"
+	$(CP) "$(CARTHAGE_EXECUTABLE)" "$(CARTHAGE_TEMPORARY_FOLDER)$(BINARIES_FOLDER)"
 
 	pkgbuild \
-		--identifier "org.carthage.carthage++" \
+		--identifier "org.carthage.carthage" \
 		--install-location "/" \
 		--root "$(CARTHAGE_TEMPORARY_FOLDER)" \
 		--version "$(VERSION_STRING)" \
@@ -74,13 +74,13 @@ package: installables
 
 prefix_install: installables
 	$(MKDIR) "$(PREFIX)/bin"
-	$(CP) -f "$(CARTHAGE_EXECUTABLE)" "$(PREFIX)/bin/carthage++"
+	$(CP) -f "$(CARTHAGE_EXECUTABLE)" "$(PREFIX)/bin/"
 
 install: installables
-	$(SUDO) $(CP) -f "$(CARTHAGE_EXECUTABLE)" "$(BINARIES_FOLDER)/carthage++"
+	$(SUDO) $(CP) -f "$(CARTHAGE_EXECUTABLE)" "$(BINARIES_FOLDER)"
 
 uninstall:
-	$(RM) "$(BINARIES_FOLDER)/carthage++"
+	$(RM) "$(BINARIES_FOLDER)/carthage"
 
 .build/libSwiftPM.xcconfig:
 	mkdir -p .build

Package.resolved

@@ -12,11 +12,11 @@
       },
       {
         "package": "Commandant",
-        "repositoryURL": "https://github.com/Carthage/Commandant.git",
+        "repositoryURL": "https://github.com/nsoperations/Commandant.git",
         "state": {
-          "branch": null,
-          "revision": "2cd0210f897fe46c6ce42f52ccfa72b3bbb621a0",
-          "version": "0.16.0"
+          "branch": "feature/success-handler",
+          "revision": "52f74502b2a06a89dffb5c29164fa7a408133225",
+          "version": null
         }
       },
       {
@@ -28,13 +28,31 @@
           "version": "4.0.2"
         }
       },
+      {
+        "package": "CwlCatchException",
+        "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
+        "state": {
+          "branch": null,
+          "revision": "7cd2f8cacc4d22f21bc0b2309c3b18acf7957b66",
+          "version": "1.2.0"
+        }
+      },
+      {
+        "package": "CwlPreconditionTesting",
+        "repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git",
+        "state": {
+          "branch": null,
+          "revision": "c228db5d2ad1b01ebc84435e823e6cca4e3db98b",
+          "version": "1.2.0"
+        }
+      },
       {
         "package": "Nimble",
         "repositoryURL": "https://github.com/Quick/Nimble.git",
         "state": {
           "branch": null,
-          "revision": "f8657642dfdec9973efc79cc68bcef43a653a2bc",
-          "version": "8.0.2"
+          "revision": "6abeb3f5c03beba2b9e4dbe20886e773b5b629b6",
+          "version": "8.0.4"
         }
       },
       {
@@ -51,8 +69,8 @@
         "repositoryURL": "https://github.com/Quick/Quick.git",
         "state": {
           "branch": null,
-          "revision": "94df9b449508344667e5afc7e80f8bcbff1e4c37",
-          "version": "2.1.0"
+          "revision": "33682c2f6230c60614861dfc61df267e11a1602f",
+          "version": "2.2.0"
         }
       },
       {
@@ -64,15 +82,6 @@
           "version": "5.0.1"
         }
       },
-      {
-        "package": "ReactiveTask",
-        "repositoryURL": "https://github.com/nsoperations/ReactiveTask.git",
-        "state": {
-          "branch": "fix/handle-launch-exceptions",
-          "revision": "14ef462cf721633eaddd906b70cb7d2015d4ac6c",
-          "version": null
-        }
-      },
       {
         "package": "Result",
         "repositoryURL": "https://github.com/antitypical/Result.git",

Package.swift

@@ -10,8 +10,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/antitypical/Result.git", from: "4.1.0"),
-        .package(url: "https://github.com/nsoperations/ReactiveTask.git", .branch("fix/handle-launch-exceptions")),
-        .package(url: "https://github.com/Carthage/Commandant.git", .exact("0.16.0")),
+        .package(url: "https://github.com/nsoperations/Commandant.git", .branch("feature/success-handler")),
         .package(url: "https://github.com/jdhealy/PrettyColors.git", from: "5.0.2"),
         .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", from: "5.0.0"),
         .package(url: "https://github.com/mdiep/Tentacle.git", from: "0.13.1"),
@@ -31,7 +30,7 @@ let package = Package(
         ),
         .target(
             name: "CarthageKit",
-            dependencies: ["XCDBLD", "Tentacle", "Curry", "BTree", "wildmatch"]
+            dependencies: ["XCDBLD", "Tentacle", "Curry", "BTree", "wildmatch", "ReactiveTask"]
         ),
         .testTarget(
             name: "CarthageKitTests",
@@ -43,6 +42,10 @@ let package = Package(
             dependencies: ["XCDBLD", "CarthageKit", "Commandant", "Curry", "PrettyColors"],
             exclude: ["swift-is-crashy.c"]
         ),
+	.target(
+            name: "ReactiveTask",
+            dependencies: ["ReactiveSwift", "Result"]
+        ),
         .target(
             name: "wildmatch"
         ),

Source/CarthageKit/CarthageKitVersion.swift

@@ -1,5 +1,5 @@
 /// Defines the current CarthageKit version.
 public struct CarthageKitVersion {
     public let value: SemanticVersion
-    public static let current = CarthageKitVersion(value: SemanticVersion(0, 40, 2, prereleaseIdentifiers: [], buildMetadataIdentifiers: []))
+    public static let current = CarthageKitVersion(value: SemanticVersion(0, 40, 2, prereleaseIdentifiers: [], buildMetadataIdentifiers: ["nsoperations"]))
 }