mirror of
https://github.com/yonaskolb/XcodeGen.git
synced 2024-08-16 16:20:51 +03:00
Fix Xcode 13 build (alternate PR to kick CI) (#1130)
* Fix Xcode 13 build * Extend Xcode 12 workaround to Xcode 13 * Update CHANGELOG * Moved CHANGELOG into 'Next Version' section Co-authored-by: Kryštof Matěj <krystof.matej@cleverlance.com>
This commit is contained in:
parent
322262cff7
commit
fa6c5c9173
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@ -4,11 +4,11 @@ on:
|
||||
pull_request: {}
|
||||
jobs:
|
||||
run:
|
||||
runs-on: macOS-latest
|
||||
runs-on: macos-11
|
||||
name: Xcode ${{ matrix.xcode }}
|
||||
strategy:
|
||||
matrix:
|
||||
xcode: ["12"]
|
||||
xcode: ["12.5.1", "13.0"]
|
||||
steps:
|
||||
- uses: actions/checkout@master
|
||||
- name: Set Xcode
|
||||
|
@ -2,6 +2,10 @@
|
||||
|
||||
## Next Version
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fix Xcode 13 build [#1130](https://github.com/yonaskolb/XcodeGen/issues/1127) @raptorxcz @mthole
|
||||
|
||||
## 2.25.0
|
||||
|
||||
### Added
|
||||
|
@ -3,7 +3,7 @@
|
||||
"pins": [
|
||||
{
|
||||
"package": "AEXML",
|
||||
"repositoryURL": "https://github.com/tadija/AEXML",
|
||||
"repositoryURL": "https://github.com/tadija/AEXML.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3",
|
||||
@ -33,8 +33,8 @@
|
||||
"repositoryURL": "https://github.com/kylef/PathKit.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "73f8e9dca9b7a3078cb79128217dc8f2e585a511",
|
||||
"version": "1.0.0"
|
||||
"revision": "3bfd2737b700b9a36565a8c94f4ad2b050a5e574",
|
||||
"version": "1.0.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -51,8 +51,8 @@
|
||||
"repositoryURL": "https://github.com/kylef/Spectre.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "f79d4ecbf8bc4e1579fbd86c3e1d652fb6876c53",
|
||||
"version": "0.9.2"
|
||||
"revision": "26cc5e9ae0947092c7139ef7ba612e34646086c7",
|
||||
"version": "0.10.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -60,8 +60,8 @@
|
||||
"repositoryURL": "https://github.com/jakeheis/SwiftCLI.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "2816678bcc37f4833d32abeddbdf5e757fa891d8",
|
||||
"version": "6.0.2"
|
||||
"revision": "2e949055d9797c1a6bddcda0e58dada16cc8e970",
|
||||
"version": "6.0.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -78,8 +78,8 @@
|
||||
"repositoryURL": "https://github.com/tuist/XcodeProj.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "8e83191dba8bcbfc0be4d7c48bf1e02e7fedc88c",
|
||||
"version": "8.2.0"
|
||||
"revision": "446f3a0db73e141c7f57e26fcdb043096b1db52c",
|
||||
"version": "8.3.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
@ -11,13 +11,13 @@ let package = Package(
|
||||
.library(name: "ProjectSpec", targets: ["ProjectSpec"]),
|
||||
],
|
||||
dependencies: [
|
||||
.package(url: "https://github.com/kylef/PathKit.git", from: "1.0.0"),
|
||||
.package(url: "https://github.com/kylef/PathKit.git", from: "1.0.1"),
|
||||
.package(url: "https://github.com/jpsim/Yams.git", from: "4.0.0"),
|
||||
.package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "4.2.0"),
|
||||
.package(url: "https://github.com/kylef/Spectre.git", from: "0.9.2"),
|
||||
.package(url: "https://github.com/onevcat/Rainbow.git", from: "3.0.0"),
|
||||
.package(url: "https://github.com/tuist/XcodeProj.git", from: "8.2.0"),
|
||||
.package(url: "https://github.com/jakeheis/SwiftCLI.git", from: "6.0.0"),
|
||||
.package(url: "https://github.com/tuist/XcodeProj.git", from: "8.3.1"),
|
||||
.package(url: "https://github.com/jakeheis/SwiftCLI.git", from: "6.0.3"),
|
||||
.package(url: "https://github.com/mxcl/Version", from: "2.0.0"),
|
||||
.package(url: "https://github.com/SwiftDocOrg/GraphViz.git", .exact("0.2.0")),
|
||||
],
|
||||
|
@ -1 +1 @@
|
||||
#include "xcode12_workaround.xcconfig"
|
||||
#include "xcode12_and_13_workaround.xcconfig"
|
||||
|
@ -1,2 +1,2 @@
|
||||
#include "xcode12_workaround.xcconfig"
|
||||
#include "xcode12_and_13_workaround.xcconfig"
|
||||
MACH_O_TYPE = staticlib
|
||||
|
@ -1,4 +1,4 @@
|
||||
#include "xcode12_workaround.xcconfig"
|
||||
#include "xcode12_and_13_workaround.xcconfig"
|
||||
|
||||
// Common settings for fixtures
|
||||
CODE_SIGN_IDENTITY =
|
||||
|
@ -6,4 +6,5 @@
|
||||
|
||||
EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64=arm64 arm64e armv7 armv7s armv6 armv8
|
||||
EXCLUDED_ARCHS_1200=$(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT))
|
||||
EXCLUDED_ARCHS_1300=$(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT))
|
||||
EXCLUDED_ARCHS=$(inherited) $(EXCLUDED_ARCHS_$(XCODE_VERSION_MAJOR))
|
Loading…
Reference in New Issue
Block a user