Skip to content

Commit 8c0a294

Browse files
committed
Update to 1.7.0
1 parent 1934718 commit 8c0a294

File tree

4 files changed

+28
-17
lines changed

4 files changed

+28
-17
lines changed

CHANGELOG.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,28 @@
22

33
## Master
44

5+
## 1.7.0
6+
57
#### Added
68

9+
- 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
710
- Added `carthageExecutablePath` option [244](https://github.com/yonaskolb/XcodeGen/pull/244) @akkyie
811
- Added `parallelizeBuild` and `buildImplicitDependencies` to Schemes [241](https://github.com/yonaskolb/XcodeGen/pull/241) @rahul-malik
9-
- Added support for scheme environment variables [239](https://github.com/yonaskolb/XcodeGen/pull/239) @turekj
12+
@yonaskolb
1013
- Added support for Core Data `xcdatamodeld` files [249](https://github.com/yonaskolb/XcodeGen/pull/249) @yonaskolb
1114
- Projects are now generated atomically by writing to a temporary directory first [250](https://github.com/yonaskolb/XcodeGen/pull/250) @yonaskolb
15+
- Added script for adding precompiled binary to releases [246](https://github.com/yonaskolb/XcodeGen/pull/246) @toshi0383
16+
- Added optional `headerVisibilty` to target source. This still defaults to public [252](https://github.com/yonaskolb/XcodeGen/pull/252) @yonaskolb
1217

1318
#### Fixed
1419
- Fixed Mint installation from reading setting presets [248](https://github.com/yonaskolb/XcodeGen/pull/248) @yonaskolb
15-
- Fixed setting `buildPhase` on a `folder` source. This allows for a folder of header files [254](https://github.com/yonaskolb/XcodeGen/pull/254) @yonaskolb
20+
- Fixed setting `buildPhase` on a `folder` source. This allows for a folder of header files [254](https://github.com/yonaskolb/XcodeGen/pull/254) @toshi0383
21+
- Carthage dependencies are not automatically embedded into test targets [256](https://github.com/yonaskolb/XcodeGen/pull/256) @yonaskolb
22+
- Carthage dependencies now respect the `embed` property [256](https://github.com/yonaskolb/XcodeGen/pull/256) @yonaskolb
23+
- 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
24+
- Excluded files are not added within .lproj directories [238](https://github.com/yonaskolb/XcodeGen/pull/238) @toshi0383
25+
26+
[Commits](https://github.com/yonaskolb/XcodeGen/compare/1.6.0...1.7.0)
1627

1728
## 1.6.0
1829

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
TOOL_NAME = XcodeGen
22
export EXECUTABLE_NAME = xcodegen
3-
VERSION = 1.6.0
3+
VERSION = 1.7.0
44

55
PREFIX = /usr/local
66
INSTALL_PATH = $(PREFIX)/bin/$(EXECUTABLE_NAME)

Sources/XcodeGen/main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import ProjectSpec
66
import XcodeGenKit
77
import xcproj
88

9-
let version = "1.6.0"
9+
let version = "1.7.0"
1010

1111
func generate(spec: String, project: String, isQuiet: Bool, justVersion: Bool) {
1212
if justVersion {

Sources/XcodeGenKit/SourceGenerator.swift

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class SourceGenerator {
2121
var addObjectClosure: (String, PBXObject) -> String
2222
var targetSourceExcludePaths: Set<Path> = []
2323
var defaultExcludedFiles = [
24-
".DS_Store"
24+
".DS_Store",
2525
]
2626

2727
var targetName: String = ""
@@ -234,23 +234,23 @@ class SourceGenerator {
234234

235235
return Set(
236236
targetSource.excludes.map {
237-
Path.glob("\(rootSourcePath)/\($0)")
238-
.map {
239-
guard $0.isDirectory else {
240-
return [$0]
241-
}
237+
Path.glob("\(rootSourcePath)/\($0)")
238+
.map {
239+
guard $0.isDirectory else {
240+
return [$0]
241+
}
242242

243-
return (try? $0.recursiveChildren().filter { $0.isFile }) ?? []
244-
}
245-
.reduce([], +)
246-
}
247-
.reduce([], +)
243+
return (try? $0.recursiveChildren().filter { $0.isFile }) ?? []
244+
}
245+
.reduce([], +)
246+
}
247+
.reduce([], +)
248248
)
249249
}
250250

251251
/// Checks whether the path is not in any default or TargetSource excludes
252252
func isIncludedPath(_ path: Path) -> Bool {
253-
return !defaultExcludedFiles.contains(where: { path.lastComponent.contains($0)})
253+
return !defaultExcludedFiles.contains(where: { path.lastComponent.contains($0) })
254254
&& !targetSourceExcludePaths.contains(path)
255255
}
256256

@@ -399,7 +399,7 @@ class SourceGenerator {
399399
/// creates source files
400400
private func getSourceFiles(targetSource: TargetSource, path: Path) throws -> [SourceFile] {
401401

402-
//generate excluded paths
402+
// generate excluded paths
403403
targetSourceExcludePaths = getSourceExcludes(targetSource: targetSource)
404404

405405
let type = targetSource.type ?? (path.isFile || path.extension != nil ? .file : .group)

0 commit comments

Comments
 (0)