Release Identifier 1.1.0

Bump the version number to 1.1.0

.travis.yml

@@ -17,32 +17,36 @@ jobs:
 
     - &spm
       stage: test
-      name: macOS / SPM 5.0 / Swift 5.0
-      script: swift test --disable-automatic-resolution -Xswiftc -swift-version -Xswiftc 5
+      name: SPM @ Xcode 10.2 / macOS
+      script: swift test --disable-automatic-resolution
     - <<: *spm
-      name: Linux / SPM 5.0 / Swift 5.0
+      name: SPM 5.0 / Linux
       os: linux
       language: generic
       env: SWIFT_VERSION=5.0 
       install: eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
 
     - &cocoapods
-      name: CocoaPods / pod lib lint
+      name: CocoaPods & Xcode 10.2 / pod lib lint
       script: pod lib lint
 
+    - &carthage
+      name: Carthage & Xcode 10.2 / carthage build --archive
+      script: carthage build --archive
+
     - &xcode
-      name: macOS / Xcode 10.2 / Swift 5.0
+      name: Xcode 10.2 / macOS
       xcode_workspace: Identifier.xcworkspace
       xcode_scheme: Identifier
       xcode_destination: 'platform=macOS'
     - <<: *xcode
-      name: iOS / Xcode 10.2 / Swift 5.0
+      name: Xcode 10.2 / iOS
       xcode_destination: 'OS=12.2,name=iPhone SE'
     - <<: *xcode
-      name: tvOS / Xcode 10.2 / Swift 5.0
+      name: Xcode 10.2 / tvOS
       xcode_destination: 'OS=12.2,name=Apple TV'
     - <<: *xcode
-      name: watchOS / Xcode 10.2 / Swift 5.0
+      name: Xcode 10.2 / watchOS
       xcode_destination: 'OS=5.2,name=Apple Watch Series 2 - 38mm'
       script: set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" -destination "$TRAVIS_XCODE_DESTINATION" build | xcpretty
 

Cartfile.private

@@ -1,4 +1,4 @@
 # Configuration for Carthage (https://github.com/Carthage/Carthage)
 
-github "jspahrsummers/xcconfigs"
+github "jspahrsummers/xcconfigs" ~> 1.0
 github "Quick/Nimble" ~> 8.0

Cartfile.resolved

@@ -1,2 +1,2 @@
 github "Quick/Nimble" "v8.0.1"
-github "jspahrsummers/xcconfigs" "0.12"
+github "jspahrsummers/xcconfigs" "1.0"

Identifier.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = "Identifier"
-  spec.version      = "0.1.1"
+  spec.version      = "1.1.0"
   spec.summary      = "Unique, strongly-typed identifiers in Swift."
   spec.description  = "`Identifier` is a generic struct backed by a UUID, which can be specialized for the model type it identifies and provides unique, decentralized identity in a value type. It is Equatable, Hashable, and Codable, serializing to a simple UUID string."
   spec.homepage     = "https://github.com/mattrubin/Identifier"

Identifier.xcodeproj/project.pbxproj

@@ -6,6 +6,20 @@
 	objectVersion = 50;
 	objects = {
 
+/* Begin PBXAggregateTarget section */
+		C9425DEB227555DC00EF93BD /* Lint Identifier */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = C9425DEE227555DD00EF93BD /* Build configuration list for PBXAggregateTarget "Lint Identifier" */;
+			buildPhases = (
+				C9425DEF227555EA00EF93BD /* Run SwiftLint */,
+			);
+			dependencies = (
+			);
+			name = "Lint Identifier";
+			productName = "Lint Identifier";
+		};
+/* End PBXAggregateTarget section */
+
 /* Begin PBXBuildFile section */
 		C97980FE224FE68800132BEC /* Identifier.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C97980F4224FE68800132BEC /* Identifier.framework */; };
 		C9798103224FE68800132BEC /* IdentifierTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9798102224FE68800132BEC /* IdentifierTests.swift */; };
@@ -24,6 +38,8 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		C950E96522529A2500583754 /* Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Framework.xcconfig; path = Base/Targets/Framework.xcconfig; sourceTree = "<group>"; };
+		C950E96622529BA500583754 /* Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Application.xcconfig; path = Base/Targets/Application.xcconfig; sourceTree = "<group>"; };
 		C97980F4224FE68800132BEC /* Identifier.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Identifier.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C97980F7224FE68800132BEC /* Identifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Identifier.swift; sourceTree = "<group>"; };
 		C97980FD224FE68800132BEC /* IdentifierTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = IdentifierTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -89,6 +105,8 @@
 			children = (
 				C979812C224FF07C00132BEC /* Debug.xcconfig */,
 				C979812D224FF07C00132BEC /* Release.xcconfig */,
+				C950E96522529A2500583754 /* Framework.xcconfig */,
+				C950E96622529BA500583754 /* Application.xcconfig */,
 			);
 			name = Configurations;
 			path = Carthage/Checkouts/xcconfigs;
@@ -147,6 +165,9 @@
 				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Matt Rubin";
 				TargetAttributes = {
+					C9425DEB227555DC00EF93BD = {
+						CreatedOnToolsVersion = 10.2.1;
+					};
 					C97980F3224FE68800132BEC = {
 						CreatedOnToolsVersion = 10.2;
 					};
@@ -169,10 +190,32 @@
 			targets = (
 				C97980F3224FE68800132BEC /* Identifier */,
 				C97980FC224FE68800132BEC /* IdentifierTests */,
+				C9425DEB227555DC00EF93BD /* Lint Identifier */,
 			);
 		};
 /* End PBXProject section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		C9425DEF227555EA00EF93BD /* Run SwiftLint */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Run SwiftLint";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if which swiftlint >/dev/null; then\n    swiftlint\nelse\n    echo \"warning: SwiftLint is not installed. (https://github.com/realm/SwiftLint)\"\nfi\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		C97980F0224FE68800132BEC /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -201,18 +244,26 @@
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
+		C9425DEC227555DD00EF93BD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		C9425DED227555DD00EF93BD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Release;
+		};
 		C9798106224FE68800132BEC /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = C979812C224FF07C00132BEC /* Debug.xcconfig */;
 			buildSettings = {
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
@@ -228,14 +279,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = C979812D224FF07C00132BEC /* Release.xcconfig */;
 			buildSettings = {
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
-				ENABLE_NS_ASSERTIONS = NO;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
@@ -249,39 +295,29 @@
 		};
 		C9798109224FE68800132BEC /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = C950E96522529A2500583754 /* Framework.xcconfig */;
 			buildSettings = {
-				APPLICATION_EXTENSION_API_ONLY = YES;
-				DEFINES_MODULE = YES;
 				INFOPLIST_FILE = Sources/Identifier/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "me.mattrubin.$(PRODUCT_NAME:c99extidentifier)";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
-				SKIP_INSTALL = YES;
 			};
 			name = Debug;
 		};
 		C979810A224FE68800132BEC /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = C950E96522529A2500583754 /* Framework.xcconfig */;
 			buildSettings = {
-				APPLICATION_EXTENSION_API_ONLY = YES;
-				DEFINES_MODULE = YES;
 				INFOPLIST_FILE = Sources/Identifier/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "me.mattrubin.$(PRODUCT_NAME:c99extidentifier)";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
-				SKIP_INSTALL = YES;
 			};
 			name = Release;
 		};
 		C979810C224FE68800132BEC /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = C950E96622529BA500583754 /* Application.xcconfig */;
 			buildSettings = {
 				INFOPLIST_FILE = Tests/IdentifierTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-					"@executable_path/../Frameworks",
-					"@loader_path/../Frameworks",
-				);
 				PRODUCT_BUNDLE_IDENTIFIER = "me.mattrubin.$(PRODUCT_NAME:c99extidentifier)";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 			};
@@ -289,15 +325,9 @@
 		};
 		C979810D224FE68800132BEC /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = C950E96622529BA500583754 /* Application.xcconfig */;
 			buildSettings = {
 				INFOPLIST_FILE = Tests/IdentifierTests/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@loader_path/Frameworks",
-					"@executable_path/../Frameworks",
-					"@loader_path/../Frameworks",
-				);
 				PRODUCT_BUNDLE_IDENTIFIER = "me.mattrubin.$(PRODUCT_NAME:c99extidentifier)";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 			};
@@ -306,6 +336,15 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		C9425DEE227555DD00EF93BD /* Build configuration list for PBXAggregateTarget "Lint Identifier" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C9425DEC227555DD00EF93BD /* Debug */,
+				C9425DED227555DD00EF93BD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		C97980EE224FE68800132BEC /* Build configuration list for PBXProject "Identifier" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

Identifier.xcodeproj/xcshareddata/xcschemes/Identifier.xcscheme

@@ -20,6 +20,20 @@
                ReferencedContainer = "container:Identifier.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C9425DEB227555DC00EF93BD"
+               BuildableName = "Lint Identifier"
+               BlueprintName = "Lint Identifier"
+               ReferencedContainer = "container:Identifier.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction

README.md

@@ -29,6 +29,54 @@ struct Comment: Equatable, Codable {
 }
 ```
 
+
+## Installation
+
+### [Carthage][]
+
+Add the following line to your [Cartfile][]:
+
+````config
+github "mattrubin/Identifier" ~> 1.1
+````
+
+Then run `carthage update Identifier` to install the latest version of the framework.
+
+Be sure to check the Carthage README file for the latest instructions on [adding frameworks to an application][carthage-instructions].
+
+[Carthage]: https://github.com/Carthage/Carthage
+[Cartfile]: https://github.com/Carthage/Carthage/blob/master/Documentation/Artifacts.md#cartfile
+[carthage-instructions]: https://github.com/Carthage/Carthage/blob/master/README.md#adding-frameworks-to-an-application
+
+### [CocoaPods][]
+
+Add the following line to your [Podfile][]:
+
+````ruby
+pod 'Identifier', '~> 1.1'
+````
+
+Identifier, like all pods written in Swift, can only be integrated as a framework. Make sure to add the line `use_frameworks!` to your Podfile or target to opt into frameworks instead of static libraries.
+
+Then run `pod install` to install the latest version of the framework.
+
+[CocoaPods]: https://cocoapods.org
+[Podfile]: https://guides.cocoapods.org/using/the-podfile.html
+
+### [SPM][]
+
+Add the following line to the dependencies section of your [package manifest][Package.swift]:
+
+```swift
+.package(url: "https://github.com/mattrubin/Identifier.git", from: "1.1.0"),
+```
+
+Then add `"Identifier"` to the dependencies array of any target which should be linked with this library 
+
+[SPM]: https://swift.org/package-manager/
+[Package.swift]: https://github.com/apple/swift-package-manager/tree/master/Documentation
+
+
 ## License
 
 Identifier is released under the [MIT License](LICENSE.md).

Sources/Identifier/Identifier.swift

@@ -12,6 +12,30 @@ public struct Identifier<T>: Equatable, Hashable {
     }
 }
 
+// MARK: - String Convertible
+
+extension Identifier: LosslessStringConvertible {
+    /// Instantiates an identifier from a string representation.
+    public init?(_ description: String) {
+        guard let uuid = UUID(uuidString: description) else {
+            return nil
+        }
+        self.init(uuid: uuid)
+    }
+
+    /// A string representation of this identifier.
+    public var description: String {
+        return uuid.uuidString
+    }
+}
+
+extension Identifier: CustomDebugStringConvertible {
+    /// A detailed string representation of this identifier, for use in debugging.
+    public var debugDescription: String {
+        return "Identifier<\(T.self)>(uuid: \(uuid))"
+    }
+}
+
 // MARK: - Codable
 
 extension Identifier: Codable {

Sources/Identifier/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.1</string>
+	<string>1.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

Tests/IdentifierTests/IdentifierTests.swift

@@ -39,6 +39,48 @@ final class IdentifierTests: XCTestCase {
         XCTAssertNotEqual(third, fourth)
     }
 
+    // MARK: - String Convertible
+
+    func testInitWithDescription() {
+        let firstFromUUID = Identifier<Int>(uuid: firstUUID)
+        let firstDescription = "B9212942-B5B9-4547-A994-375921769411"
+        let firstFromDescription = Identifier<Int>(firstDescription)
+        XCTAssertEqual(firstFromDescription, firstFromUUID)
+
+        let secondRandom = Identifier<String>.random()
+        let secondDescription = secondRandom.uuid.uuidString
+        let secondFromDescription = Identifier<String>(secondDescription)
+        XCTAssertEqual(secondFromDescription, secondRandom)
+
+        let validDescription = UUID().uuidString
+        let validIdentifier = Identifier<Float>(validDescription)
+        XCTAssertNotNil(validIdentifier)
+
+        let invalidDescription = "12345"
+        let invalidIdentifier = Identifier<Float>(invalidDescription)
+        XCTAssertNil(invalidIdentifier)
+    }
+
+    func testDescription() {
+        let first = Identifier<Int>(uuid: firstUUID)
+        let firstExpectedDebugDescription = "B9212942-B5B9-4547-A994-375921769411"
+        XCTAssertEqual(first.description, firstExpectedDebugDescription)
+
+        let second = Identifier<String>.random()
+        let secondExpectedDebugDescription = second.uuid.uuidString
+        XCTAssertEqual(second.description, secondExpectedDebugDescription)
+    }
+
+    func testDebugDescription() {
+        let first = Identifier<Int>(uuid: firstUUID)
+        let firstExpectedDebugDescription = "Identifier<Int>(uuid: B9212942-B5B9-4547-A994-375921769411)"
+        XCTAssertEqual(first.debugDescription, firstExpectedDebugDescription)
+
+        let second = Identifier<String>.random()
+        let secondExpectedDebugDescription = "Identifier<String>(uuid: " + second.uuid.uuidString + ")"
+        XCTAssertEqual(second.debugDescription, secondExpectedDebugDescription)
+    }
+
     // MARK: - Codable
 
     func testEncode() {

Tests/IdentifierTests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.1</string>
+	<string>1.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

Tests/IdentifierTests/XCTestManifests.swift

@@ -6,9 +6,12 @@ extension IdentifierTests {
     //   `swift test --generate-linuxmain`
     // to regenerate.
     static let __allTests__IdentifierTests = [
+        ("testDebugDescription", testDebugDescription),
         ("testDecode", testDecode),
+        ("testDescription", testDescription),
         ("testEncode", testEncode),
         ("testEquality", testEquality),
+        ("testInitWithDescription", testInitWithDescription),
         ("testInitWithUUID", testInitWithUUID),
         ("testRandomIdentifier", testRandomIdentifier),
     ]