Update to 1.7.0

yonaskolb · Mar 2, 2018 · 8c0a294 · 8c0a294
1 parent 1934718
commit 8c0a294
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,17 +2,28 @@
 
 ## Master
 
+## 1.7.0
+
 #### Added
 
+- Added support for scheme environment variables [239](https://github.com/yonaskolb/XcodeGen/pull/239) [254](https://github.com/yonaskolb/XcodeGen/pull/254) [259](https://github.com/yonaskolb/XcodeGen/pull/259) @turekj @toshi0383
 - Added `carthageExecutablePath` option [244](https://github.com/yonaskolb/XcodeGen/pull/244) @akkyie
 - Added `parallelizeBuild` and `buildImplicitDependencies` to Schemes [241](https://github.com/yonaskolb/XcodeGen/pull/241) @rahul-malik
-- Added support for scheme environment variables [239](https://github.com/yonaskolb/XcodeGen/pull/239) @turekj
+ @yonaskolb
 - Added support for Core Data `xcdatamodeld` files [249](https://github.com/yonaskolb/XcodeGen/pull/249) @yonaskolb
 - Projects are now generated atomically by writing to a temporary directory first [250](https://github.com/yonaskolb/XcodeGen/pull/250) @yonaskolb
+- Added script for adding precompiled binary to releases [246](https://github.com/yonaskolb/XcodeGen/pull/246) @toshi0383
+- Added optional `headerVisibilty` to target source. This still defaults to public [252](https://github.com/yonaskolb/XcodeGen/pull/252) @yonaskolb
 
 #### Fixed
 - Fixed Mint installation from reading setting presets [248](https://github.com/yonaskolb/XcodeGen/pull/248) @yonaskolb
-- Fixed setting `buildPhase` on a `folder` source. This allows for a folder of header files [254](https://github.com/yonaskolb/XcodeGen/pull/254) @yonaskolb
+- Fixed setting `buildPhase` on a `folder` source. This allows for a folder of header files [254](https://github.com/yonaskolb/XcodeGen/pull/254) @toshi0383
+- Carthage dependencies are not automatically embedded into test targets [256](https://github.com/yonaskolb/XcodeGen/pull/256) @yonaskolb
+- Carthage dependencies now respect the `embed` property [256](https://github.com/yonaskolb/XcodeGen/pull/256) @yonaskolb
+- iMessage extensions now have proper setting presets in regards to app icon and runtime search paths [255](https://github.com/yonaskolb/XcodeGen/pull/255) @yonaskolb
+- Excluded files are not added within .lproj directories [238](https://github.com/yonaskolb/XcodeGen/pull/238) @toshi0383
+
+[Commits](https://github.com/yonaskolb/XcodeGen/compare/1.6.0...1.7.0)
 
 ## 1.6.0
 

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 TOOL_NAME = XcodeGen
 export EXECUTABLE_NAME = xcodegen
-VERSION = 1.6.0
+VERSION = 1.7.0
 
 PREFIX = /usr/local
 INSTALL_PATH = $(PREFIX)/bin/$(EXECUTABLE_NAME)

diff --git a/Sources/XcodeGen/main.swift b/Sources/XcodeGen/main.swift
@@ -6,7 +6,7 @@ import ProjectSpec
 import XcodeGenKit
 import xcproj
 
-let version = "1.6.0"
+let version = "1.7.0"
 
 func generate(spec: String, project: String, isQuiet: Bool, justVersion: Bool) {
     if justVersion {

diff --git a/Sources/XcodeGenKit/SourceGenerator.swift b/Sources/XcodeGenKit/SourceGenerator.swift
@@ -21,7 +21,7 @@ class SourceGenerator {
     var addObjectClosure: (String, PBXObject) -> String
     var targetSourceExcludePaths: Set<Path> = []
     var defaultExcludedFiles = [
-        ".DS_Store"
+        ".DS_Store",
     ]
 
     var targetName: String = ""
@@ -234,23 +234,23 @@ class SourceGenerator {
 
         return Set(
             targetSource.excludes.map {
-            Path.glob("\(rootSourcePath)/\($0)")
-                .map {
-                    guard $0.isDirectory else {
-                        return [$0]
-                    }
+                Path.glob("\(rootSourcePath)/\($0)")
+                    .map {
+                        guard $0.isDirectory else {
+                            return [$0]
+                        }
 
-                    return (try? $0.recursiveChildren().filter { $0.isFile }) ?? []
-                }
-                .reduce([], +)
-        }
-        .reduce([], +)
+                        return (try? $0.recursiveChildren().filter { $0.isFile }) ?? []
+                    }
+                    .reduce([], +)
+            }
+            .reduce([], +)
         )
     }
 
     /// Checks whether the path is not in any default or TargetSource excludes
     func isIncludedPath(_ path: Path) -> Bool {
-        return !defaultExcludedFiles.contains(where: { path.lastComponent.contains($0)})
+        return !defaultExcludedFiles.contains(where: { path.lastComponent.contains($0) })
             && !targetSourceExcludePaths.contains(path)
     }
 
@@ -399,7 +399,7 @@ class SourceGenerator {
     /// creates source files
     private func getSourceFiles(targetSource: TargetSource, path: Path) throws -> [SourceFile] {
 
-        //generate excluded paths
+        // generate excluded paths
         targetSourceExcludePaths = getSourceExcludes(targetSource: targetSource)
 
         let type = targetSource.type ?? (path.isFile || path.extension != nil ? .file : .group)