Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Xcode 10 & Swift 4.2 #683

Merged
merged 10 commits into from
Sep 22, 2018
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
jobs:
test:
macos:
xcode: "9.3.0"
xcode: "10.0.0"
environment:
- XCODE_WORKSPACE: Sourcery.xcworkspace
- XCODE_PROJECT: Sourcery.xcodeproj
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

---

## Master

- Adding support for Xcode 10

## 0.14.0

### New Features
Expand Down
65 changes: 28 additions & 37 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,71 +6,62 @@
"repositoryURL": "https://github.com/tadija/AEXML.git",
"state": {
"branch": null,
"revision": "09f27784d9e328670ef0a181c832cce497117131",
"version": "4.2.2"
"revision": "54bb8ea6fb693dd3f92a89e5fcc19e199fdeedd0",
"version": "4.3.3"
}
},
{
"package": "Commandant",
"repositoryURL": "https://github.com/Carthage/Commandant.git",
"state": {
"branch": null,
"revision": "7f29606ec3a2054a601f0e72f562a104dbc1a11a",
"version": "0.13.0"
"revision": "07cad52573bad19d95844035bf0b25acddf6b0f6",
"version": "0.15.0"
}
},
{
"package": "Commander",
"repositoryURL": "https://github.com/kylef/Commander.git",
"state": {
"branch": null,
"revision": "4c320a3507d621d27f89514eb576664becfee643",
"version": "0.6.1"
}
},
{
"package": "CommonCrypto",
"repositoryURL": "https://github.com/IBM-Swift/CommonCrypto.git",
"state": {
"branch": null,
"revision": "9156d238dbc4c15455b77b45e721b2bb0b995e31",
"version": "0.1.5"
"revision": "26a7eeb8bea1a9125e927c665902f54b2c952c7f",
"version": "0.7.1"
}
},
{
"package": "Nimble",
"repositoryURL": "https://github.com/Quick/Nimble.git",
"state": {
"branch": null,
"revision": "22800b0954c89344bb8c87f8ab93378076716fb7",
"version": "7.0.3"
"revision": "7c61d8e7e830dd37f7161ce2b894be178532163c",
"version": "7.3.0"
}
},
{
"package": "PathKit",
"repositoryURL": "https://github.com/kylef/PathKit.git",
"state": {
"branch": null,
"revision": "891a3fec2699fc43aed18b7649950677c0152a22",
"version": "0.8.0"
"revision": "fa81fa9e3a9f59645159c4ea45c0c46ee6558f71",
"version": "0.9.1"
}
},
{
"package": "Quick",
"repositoryURL": "https://github.com/Quick/Quick.git",
"state": {
"branch": null,
"revision": "0ff81f2c665b4381f526bd656f8708dd52a9ea2f",
"version": "1.2.0"
"revision": "b060679e70d13c3c7dcd124201b5b1b34ce6f340",
"version": "1.3.1"
}
},
{
"package": "Result",
"repositoryURL": "https://github.com/antitypical/Result.git",
"state": {
"branch": null,
"revision": "7477584259bfce2560a19e06ad9f71db441fff11",
"version": "3.2.4"
"revision": "8fc088dcf72802801efeecba76ea8fb041fb773d",
"version": "4.0.0"
}
},
{
Expand All @@ -87,35 +78,35 @@
"repositoryURL": "https://github.com/jpsim/SourceKitten.git",
"state": {
"branch": null,
"revision": "e6efd3d8702fe6668ac43aa882d56f82430c6caf",
"version": "0.21.1"
"revision": "4be914be6fa49cd30b1e7ef5d32d06c037d8f469",
"version": "0.21.2"
}
},
{
"package": "Spectre",
"repositoryURL": "https://github.com/kylef/Spectre.git",
"state": {
"branch": null,
"revision": "e46b75cf03ad5e563b4b0a5068d3d6f04d77d80b",
"version": "0.7.2"
"revision": "e34d5687e1e9d865e3527dd58bc2f7464ef6d936",
"version": "0.8.0"
}
},
{
"package": "Stencil",
"repositoryURL": "https://github.com/kylef/Stencil.git",
"state": {
"branch": null,
"revision": "cf7acea440124f6d348032123d8b163c51cfece0",
"version": "0.10.1"
"revision": "b476e50f89577f5848e8013dbf0a850abac892aa",
"version": "0.12.1"
}
},
{
"package": "StencilSwiftKit",
"repositoryURL": "https://github.com/SwiftGen/StencilSwiftKit.git",
"state": {
"branch": null,
"revision": "ffb22bf1c90f9284ee90db64ae226ccd63d42aef",
"version": "2.4.0"
"revision": "17e6ae91838afb90ab873194e45fa5b01731e322",
"version": "2.6.0"
}
},
{
Expand All @@ -132,26 +123,26 @@
"repositoryURL": "https://github.com/drmohundro/SWXMLHash.git",
"state": {
"branch": null,
"revision": "2211b35c2e0e8b08493f86ba52b26e530cabb751",
"version": "4.7.0"
"revision": "0ce63a93a455adb3cd5e4c55f78f1232a590a5a5",
"version": "4.7.2"
}
},
{
"package": "xcproj",
"repositoryURL": "https://github.com/xcodeswift/xcproj.git",
"state": {
"branch": null,
"revision": "eaddb983150f2eb1d308f4949b8e31d6cae4e7e9",
"version": "4.2.0"
"revision": "5253c22f208558264e3a64a3a29f11537ca1b41a",
"version": "4.3.1"
}
},
{
"package": "Yams",
"repositoryURL": "https://github.com/jpsim/Yams.git",
"state": {
"branch": null,
"revision": "618582e09699b577fa183bab7d88e3ee7d9a1d19",
"version": "1.0.0"
"revision": "26ab35f50ea891e8edefcc9d975db2f6b67e1d68",
"version": "1.0.1"
}
}
]
Expand Down
16 changes: 7 additions & 9 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,15 @@ let package = Package(
.library(name: "SourceryJS", targets: ["SourceryJS"]),
],
dependencies: [
.package(url: "https://github.com/kylef/Commander.git", .exact("0.6.1")),
.package(url: "https://github.com/kylef/Commander.git", .exact("0.7.1")),
// PathKit needs to be exact to avoid a SwiftPM bug where dependency resolution takes a very long time.
.package(url: "https://github.com/kylef/PathKit.git", .exact("0.8.0")),
.package(url: "https://github.com/jpsim/SourceKitten.git", .exact("0.21.1")),
.package(url: "https://github.com/IBM-Swift/CommonCrypto.git", .exact("0.1.5")),
.package(url: "https://github.com/kylef/Stencil.git", .exact("0.10.1")),
.package(url: "https://github.com/SwiftGen/StencilSwiftKit.git", .exact("2.4.0")),
.package(url: "https://github.com/kylef/PathKit.git", .exact("0.9.1")),
.package(url: "https://github.com/jpsim/SourceKitten.git", .exact("0.21.2")),
.package(url: "https://github.com/kylef/Stencil.git", .exact("0.12.1")),
.package(url: "https://github.com/SwiftGen/StencilSwiftKit.git", .exact("2.6.0")),
.package(url: "https://github.com/seanparsons/SwiftTryCatch.git", .revision("e7074a72e4d4dc516f391bc4d4afd8ca6a845b4b")),
.package(url: "https://github.com/xcodeswift/xcproj.git", .exact("4.2.0")),
.package(url: "https://github.com/tadija/AEXML.git", .exact("4.2.2")),
.package(url: "https://github.com/xcodeswift/xcproj.git", .exact("4.3.1")),
.package(url: "https://github.com/tadija/AEXML.git", .exact("4.3.3")),
],
targets: [
.target(name: "Sourcery", dependencies: [
Expand All @@ -28,7 +27,6 @@ let package = Package(
"Commander",
"PathKit",
"SourceKittenFramework",
"CommonCrypto",
"StencilSwiftKit",
"xcproj",
"SwiftTryCatch",
Expand Down
26 changes: 10 additions & 16 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,14 @@ target 'CodableContextTests' do
end

target 'Sourcery' do
pod 'Stencil', '0.10.1'
pod 'StencilSwiftKit', '2.4.0'
pod 'Commander', '0.6.0'
pod 'PathKit', '0.8.0'
pod "xcproj", '4.2.0'
pod 'SourceKittenFramework', '0.21.1'
pod 'Stencil', '0.12.1'
pod 'StencilSwiftKit', '2.6.0'
pod 'Commander', '0.7.0'
pod 'PathKit', '0.9.2'
pod "xcproj", :git =>'git@github.com:tuist/xcodeproj.git', :tag => '4.3.1'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the reason you use a fork instead of https://github.com/xcodeswift/xcproj.git here? Because you're using the main repo in the SPM manifest 🤔

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

xcodeswift/xcproj.git redirects to tuis/xcodeproj.git

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's a shame that they didn't release the 4.3.1 version properly with cocoapods..

pod 'SourceKittenFramework', '0.21.2'
pod 'SwiftTryCatch', :git => 'git@github.com:seanparsons/SwiftTryCatch', :commit => '798c512'
pod 'libCommonCrypto'
pod 'AEXML', '4.2.2'
pod 'AEXML', '4.3.3'

target 'SourceryTests' do
inherit! :search_paths
Expand All @@ -43,24 +42,19 @@ target 'Sourcery' do
end

target 'SourceryJS' do
pod 'PathKit'
pod 'PathKit', '0.9.2'
end

target 'SourcerySwift' do
pod 'PathKit'
pod 'libCommonCrypto'
pod 'PathKit', '0.9.2'
end

swift4 = ['SourceKittenFramework', 'Yams', 'xcproj']

post_install do |installer|
installer.pods_project.targets.each do |target|
swift_version = '3.2'
if swift4.include?(target.name)
swift_version = '4.0'
end
target.build_configurations.each do |config|
config.build_settings['SWIFT_VERSION'] = swift_version
config.build_settings['SWIFT_VERSION'] = '4.0'
end
end
end
82 changes: 42 additions & 40 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,66 +1,68 @@
PODS:
- AEXML (4.2.2)
- Commander (0.6.0)
- libCommonCrypto (0.1.1)
- Nimble (7.0.3)
- PathKit (0.8.0)
- Quick (1.2.0)
- SourceKittenFramework (0.21.1):
- AEXML (4.3.3)
- Commander (0.7.0)
- Nimble (7.3.0)
- PathKit (0.9.2)
- Quick (1.3.1)
- SourceKittenFramework (0.21.2):
- SWXMLHash (~> 4.7)
- Yams (~> 1.0)
- Stencil (0.10.1):
- PathKit (~> 0.8.0)
- StencilSwiftKit (2.4.0):
- Stencil (~> 0.10)
- SwiftLint (0.25.1)
- Stencil (0.12.1):
- PathKit (~> 0.9.0)
- StencilSwiftKit (2.6.0):
- Stencil (~> 0.12.1)
- SwiftLint (0.27.0)
- SwiftTryCatch (1.0.0)
- SWXMLHash (4.7.0)
- xcproj (4.2.0):
- AEXML (~> 4.1)
- PathKit (~> 0.8)
- Yams (1.0.0)
- SWXMLHash (4.7.2)
- xcproj (4.3.0):
- AEXML (~> 4.3)
- PathKit (~> 0.9.1)
- Yams (1.0.1)

DEPENDENCIES:
- AEXML (= 4.2.2)
- Commander (= 0.6.0)
- libCommonCrypto
- AEXML (= 4.3.3)
- Commander (= 0.7.0)
- Nimble
- PathKit
- PathKit (= 0.8.0)
- PathKit (= 0.9.2)
- Quick
- SourceKittenFramework (= 0.21.1)
- Stencil (= 0.10.1)
- StencilSwiftKit (= 2.4.0)
- SourceKittenFramework (= 0.21.2)
- Stencil (= 0.12.1)
- StencilSwiftKit (= 2.6.0)
- SwiftLint
- SwiftTryCatch (from `git@github.com:seanparsons/SwiftTryCatch`, commit `798c512`)
- xcproj (= 4.2.0)
- xcproj (from `git@github.com:tuist/xcodeproj.git`, tag `4.3.1`)

EXTERNAL SOURCES:
SwiftTryCatch:
:commit: 798c512
:git: git@github.com:seanparsons/SwiftTryCatch
xcproj:
:git: git@github.com:tuist/xcodeproj.git
:tag: 4.3.1

CHECKOUT OPTIONS:
SwiftTryCatch:
:commit: 798c512
:git: git@github.com:seanparsons/SwiftTryCatch
xcproj:
:git: git@github.com:tuist/xcodeproj.git
:tag: 4.3.1

SPEC CHECKSUMS:
AEXML: 5ebafc1b75e0bcf0f1b09b8ca8fed2d5a199479b
Commander: fba7c96c9e787ecc8ebe0737be875e1e18ef47ff
libCommonCrypto: 8bc2f53375ef9815ddd9dd663e110e1cced41747
Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
PathKit: dcab05d701474011aae0e40cf892298a831f63d6
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
SourceKittenFramework: 422ab99cb9fc7a61df4650ae5bd779f71edf1bc2
Stencil: 40b382c52edab08f1e800e6144c1f04ae47a7a9a
StencilSwiftKit: b2d282c788559bc19166eee070ffa513fedf8c05
SwiftLint: ce933681be10c3266e82576dad676fa815a602e9
AEXML: 601f41fcaa7bda7605cad153b0f43db9ec006c0f
Commander: a12712a84e9641e712aa5b6c196fddb8d6556189
Nimble: c8d6a1f463701921c46de965c673e13cafa09196
PathKit: 273f59a38e3218eb95abd9f6a61730a8bcfd2f06
Quick: d17304d58d0d169dd0bd1c6e5c28e3318de32a1a
SourceKittenFramework: 939cbc178445dfd3700a7476187ad36443a1d756
Stencil: 8a08577b341a059420c444b8aa5733378a6a4384
StencilSwiftKit: 8965117982a901cc385c156be950a75e396e89c9
SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
SwiftTryCatch: 8dec58919b07ddba4f23c80e814f7e49f05da548
SWXMLHash: f4522438189f72b41e39676d19469a8969d60dd1
xcproj: bf5339a8c8b295e3364a16074d842b3ea71a4f5b
Yams: a01cdee527b3a82a3e192255b34ad5aacdf96b8c
SWXMLHash: f0761e5c5d1a49f6553609bd0f5696a61738c5b9
xcproj: 7a9fe0c5f00617c0fa306b37858f157c786aff42
Yams: 572f625a8b719b73e0b57fd313c680f3e2161fe9

PODFILE CHECKSUM: 1889280aa219d96bfbfbd345812334c52a11f023
PODFILE CHECKSUM: 6420078304b6181f8a16f96228a39662f867ae9f

COCOAPODS: 1.4.0
2 changes: 1 addition & 1 deletion Pods/AEXML/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading