Skip to content

Commit

Permalink
Merge pull request #181 from jpsim/release-2.0
Browse files Browse the repository at this point in the history
Release 2.0
  • Loading branch information
norio-nomura authored Apr 6, 2019
2 parents 0452fff + a769410 commit c947a30
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 33 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Master
## 2.0.0

##### Breaking

Expand Down
42 changes: 21 additions & 21 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,51 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.0)
activesupport (4.2.11)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.5.3)
cocoapods (1.6.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.5.3)
cocoapods-core (= 1.6.1)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.2.0, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.3.0, < 2.0)
cocoapods-trunk (>= 1.3.1, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (~> 2.0.1)
fourflusher (>= 2.2.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.5)
molinillo (~> 0.6.6)
nap (~> 1.0)
ruby-macho (~> 1.1)
xcodeproj (>= 1.5.7, < 2.0)
cocoapods-core (1.5.3)
ruby-macho (~> 1.4)
xcodeproj (>= 1.8.1, < 2.0)
cocoapods-core (1.6.1)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.2)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.2.2)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-stats (1.1.0)
cocoapods-trunk (1.3.1)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
colored2 (3.1.2)
concurrent-ruby (1.1.3)
concurrent-ruby (1.1.5)
escape (0.0.4)
ffi (1.9.25)
fourflusher (2.0.1)
ffi (1.10.0)
fourflusher (2.2.0)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
i18n (0.9.5)
Expand All @@ -69,23 +69,23 @@ GEM
netrc (0.11.0)
open4 (1.3.4)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rb-inotify (0.10.0)
ffi (~> 1.0)
redcarpet (3.4.0)
rouge (3.3.0)
ruby-macho (1.3.1)
sass (3.7.2)
ruby-macho (1.4.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sqlite3 (1.3.13)
sqlite3 (1.4.0)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
xcinvoke (0.3.0)
liferaft (~> 0.0.6)
xcodeproj (1.7.0)
xcodeproj (1.8.2)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ A sweet and swifty [YAML](http://yaml.org/) parser built on

## Installation

Building Yams on macOS requires Xcode 9.x or a Swift 3.2/4.x toolchain with
the Swift Package Manager.
Building Yams on macOS requires Xcode 9.x/10.x or a Swift 3.2/4.x/5.x toolchain
with the Swift Package Manager.

Building Yams on Linux requires a Swift 4.x compiler and Swift Package Manager
to be installed.
Building Yams on Linux requires a Swift 4.x/5.x compiler and Swift Package
Manager to be installed.

### Swift Package Manager

Add `.package(url: "https://github.com/jpsim/Yams.git", from: "1.0.2")` to your
Add `.package(url: "https://github.com/jpsim/Yams.git", from: "2.0.0")` to your
`Package.swift` file's `dependencies`.

### CocoaPods
Expand Down
5 changes: 3 additions & 2 deletions Yams.podspec
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
Pod::Spec.new do |s|
s.name = 'Yams'
s.version = '1.0.2'
s.version = '2.0.0'
s.summary = 'A sweet and swifty YAML parser.'
s.homepage = 'https://github.com/jpsim/Yams'
s.source = { :git => s.homepage + '.git', :tag => s.version }
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { 'JP Simard' => '[email protected]' }
s.authors = { 'JP Simard' => '[email protected]',
'Norio Nomura' => '[email protected]' }
s.source_files = 'Sources/**/*.{h,c,swift}'
s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }
s.ios.deployment_target = '8.0'
Expand Down
2 changes: 1 addition & 1 deletion Yams.xcodeproj/Yams_Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.2</string>
<string>2.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- job: linux_swift50
pool:
vmImage: 'Ubuntu 16.04'
container: norionomura/swift:swift-5.0-branch
container: swift:5.0
steps:
- script: swift test --parallel
displayName: swift test with UTF16
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
pool:
vmImage: 'macOS 10.13'
variables:
DEVELOPER_DIR: /Applications/Xcode_9.4.1.app
DEVELOPER_DIR: /Applications/Xcode_10.1.app
steps:
- script: pod lib lint
displayName: pod lib lint
Expand All @@ -169,7 +169,7 @@ jobs:
- job: jazzy
pool:
vmImage: 'Ubuntu 16.04'
container: norionomura/jazzy:0.9.4_swift-4.2.1
container: norionomura/jazzy:0.9.6_swift-4.2.4
steps:
- script: bundle install --path vendor/bundle
displayName: bundle install
Expand Down

0 comments on commit c947a30

Please sign in to comment.