scribd · trupin · May 30, 2018 · May 6, 2018 · May 13, 2018 · May 30, 2018
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.1
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: objective-c
 os: osx
-osx_image: xcode9.2
+osx_image: xcode9.3
 env:
   - TOOLCHAINS=swift
 cache:

diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ build:
 	$(call build)
 
 generate_sources:
-	$(call generate_sources)
+	bash -c "(command -v sourcery && sourcery) || echo 'warning: Sourcery is not installed'"
 
 clean:
 	rm -rf .build
@@ -30,12 +30,7 @@ codecov:
 	bash -c "bash <(curl -s https://codecov.io/bash) -J Weaver -t eaa7c4af-5ca2-4e08-8f07-38a44671e5e0"
 	rm *.coverage.txt
 
-define generate_sources
-    sourcery
-endef
-
 define build
-	$(call generate_sources)
 	@swift build --disable-sandbox --configuration release
 endef
 

diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:4.1
 import PackageDescription
 
 let package = Package(

diff --git a/Sources/WeaverCodeGen/Generator.swift b/Sources/WeaverCodeGen/Generator.swift
@@ -271,7 +271,7 @@ extension ResolverModel {
                 RegisterModel(registerAnnotation: $0.value,
                              scopeAnnotation: scopeAnnotations[$0.key],
                              customRefAnnotation: customRefAnnotations[$0.key])
-            } + referenceAnnotations.flatMap {
+            } + referenceAnnotations.compactMap {
                 if let customRefAnnotation = customRefAnnotations[$0.key] {
                     return RegisterModel(referenceAnnotation: $0.value,
                                         scopeAnnotation: scopeAnnotations[$0.key],

diff --git a/Sources/WeaverCodeGen/Lexer.swift b/Sources/WeaverCodeGen/Lexer.swift
@@ -99,7 +99,7 @@ private extension Lexer {
     func tokenize(from sourceKitTokens: [SyntaxToken]) throws -> [AnyTokenBox] {
 
         var currentLine = lines.startIndex
-        return try sourceKitTokens.flatMap { syntaxToken in
+        return try sourceKitTokens.compactMap { syntaxToken in
 
             guard SyntaxKind(rawValue: syntaxToken.type) == .comment else {
                 return nil

diff --git a/Sources/WeaverCodeGen/SourceKitDeclaration.swift b/Sources/WeaverCodeGen/SourceKitDeclaration.swift
@@ -27,7 +27,7 @@ struct SourceKitDeclaration {
 
         let inheritedTypes: [String]
         if let inheritedTypeDicts = dictionary[SwiftDocKey.inheritedtypes.rawValue] as? [[String: Any]] {
-            inheritedTypes = inheritedTypeDicts.flatMap { $0[SwiftDocKey.name.rawValue] as? String }
+            inheritedTypes = inheritedTypeDicts.compactMap { $0[SwiftDocKey.name.rawValue] as? String }
         } else {
             inheritedTypes = []
         }

diff --git a/Sources/WeaverCodeGen/Token.swift b/Sources/WeaverCodeGen/Token.swift
@@ -263,7 +263,7 @@ private extension NSRegularExpression {
         let result = self
             .matches(in: string, range: NSMakeRange(0, string.utf16.count))
             .flatMap { match in (1..<match.numberOfRanges).map { match.range(at: $0) } }
-            .flatMap { Range($0, in: string) }
+            .compactMap { Range($0, in: string) }
             .map { String(string[$0]) }
 
         if result.isEmpty {

diff --git a/Sources/WeaverCommand/main.swift b/Sources/WeaverCommand/main.swift
@@ -26,7 +26,7 @@ let main = command(
         // ---- Parse ----
 
         Logger.log(.info, "Parsing...")
-        let asts: [Expr] = try inputPaths.values.flatMap { filePath in
+        let asts: [Expr] = try inputPaths.values.compactMap { filePath in
             guard let file = File(path: filePath.string) else {
                 return nil
             }
@@ -43,7 +43,7 @@ let main = command(
 
         // ---- Collect ----
 
-        let dataToWrite: [(path: Path, data: String?)] = generatedData.flatMap { (file, data) in
+        let dataToWrite: [(path: Path, data: String?)] = generatedData.compactMap { (file, data) in
 
             let filePath = Path(file)
 

diff --git a/Weaver.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Weaver.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/WeaverDI.podspec b/WeaverDI.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name = "WeaverDI"
   s.version = "0.9.6"
-  s.swift_version = "4.0"
+  s.swift_version = "4.1"
   s.summary = "Declarative, easy-to-use and safe Dependency Injection framework for Swift (iOS/macOS/Linux)"
   s.homepage = "https://github.com/scribd/Weaver"
   s.license = { :type => "MIT", :file => "LICENSE" }

diff --git a/WeaverDI.xcodeproj/project.pbxproj b/WeaverDI.xcodeproj/project.pbxproj
@@ -983,7 +983,7 @@
 			path = Tests/WeaverCodeGenTests;
 			sourceTree = SOURCE_ROOT;
 		};
-		OBJ_5 /*  */ = {
+		OBJ_5 = {
 			isa = PBXGroup;
 			children = (
 				OBJ_6 /* Package.swift */,
@@ -997,7 +997,6 @@
 				OBJ_55 /* Dependencies */,
 				OBJ_180 /* Products */,
 			);
-			name = "";
 			sourceTree = "<group>";
 		};
 		OBJ_55 /* Dependencies */ = {
@@ -1335,6 +1334,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = OBJ_325 /* Build configuration list for PBXNativeTarget "WeaverCodeGen" */;
 			buildPhases = (
+				19F3CD5620BF3851007C3076 /* Generate Sources */,
 				OBJ_328 /* Sources */,
 				OBJ_343 /* Frameworks */,
 			);
@@ -1501,7 +1501,7 @@
 			knownRegions = (
 				en,
 			);
-			mainGroup = OBJ_5 /*  */;
+			mainGroup = OBJ_5;
 			productRefGroup = OBJ_180 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -1532,6 +1532,23 @@
 		};
 /* End PBXProject section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		19F3CD5620BF3851007C3076 /* Generate Sources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Generate Sources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "make generate_sources";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		OBJ_198 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;

diff --git a/WeaverDI.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/WeaverDI.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>