Require Swift 5.4 (#347)
* Update jazzy job to use newest versions of jazzy & Swift * Bump rules_apple from 0.30.0 to 0.33.0
This commit is contained in:
parent
6ac70dd4ea
commit
b951102b1f
|
@ -47,7 +47,7 @@ jobs:
|
|||
Linux:
|
||||
strategy:
|
||||
matrix:
|
||||
tag: ['5.1', '5.2', '5.3', '5.4', '5.5']
|
||||
tag: ['5.4', '5.5']
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: swift:${{ matrix.tag }}
|
||||
|
|
|
@ -25,7 +25,7 @@ jobs:
|
|||
CMake:
|
||||
strategy:
|
||||
matrix:
|
||||
xcode_version: ['11.7', '12.4', '12.5.1', '13.0', '13.1', '13.2.1']
|
||||
xcode_version: ['12.5.1', '13.0', '13.1', '13.2.1']
|
||||
runs-on: macos-11
|
||||
env:
|
||||
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode_version }}.app
|
||||
|
|
|
@ -24,14 +24,24 @@ on:
|
|||
jobs:
|
||||
Jazzy:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: norionomura/jazzy:0.13.6_swift-5.3.3
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- run: bundle install --path vendor/bundle
|
||||
- uses: ruby/setup-ruby@v1
|
||||
with:
|
||||
ruby-version: 2.7.5
|
||||
bundler-cache: true
|
||||
env:
|
||||
ImageOS: ubuntu18
|
||||
- uses: fwal/setup-swift@v1
|
||||
with:
|
||||
swift-version: "5.5"
|
||||
- name: Install SourceKitten
|
||||
uses: fjcaetano/mint-action@v1.0.2
|
||||
with:
|
||||
package: jpsim/SourceKitten
|
||||
- run: swift build
|
||||
- name: Generate documentation json
|
||||
run: sourcekitten doc --spm-module Yams > yams.json
|
||||
run: /home/runner/.mint/bin/sourcekitten doc --spm --module-name Yams > yams.json
|
||||
- name: Run jazzy
|
||||
run: bundle exec jazzy --clean --sourcekitten-sourcefile yams.json
|
||||
- name: Validate documentation coverage
|
||||
|
|
|
@ -27,20 +27,7 @@ jobs:
|
|||
Xcode:
|
||||
strategy:
|
||||
matrix:
|
||||
xcode_version: ['11.2.1', '11.3.1', '11.4.1', '11.5', '11.6', '12.0.1', '12.1']
|
||||
runs-on: macOS-10.15
|
||||
env:
|
||||
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode_version }}.app
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- run: swift -version
|
||||
- run: YAMS_DEFAULT_ENCODING=UTF16 swift test --parallel
|
||||
- run: YAMS_DEFAULT_ENCODING=UTF8 swift test --parallel
|
||||
|
||||
Xcode_Big_Sur:
|
||||
strategy:
|
||||
matrix:
|
||||
xcode_version: ['11.7', '12.4', '12.5.1', '13.0', '13.1', '13.2.1']
|
||||
xcode_version: ['12.5.1', '13.0', '13.1', '13.2.1']
|
||||
runs-on: macos-11
|
||||
env:
|
||||
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode_version }}.app
|
||||
|
@ -62,7 +49,7 @@ jobs:
|
|||
Linux:
|
||||
strategy:
|
||||
matrix:
|
||||
tag: ['5.1', '5.2', '5.3', '5.4', '5.5']
|
||||
tag: ['5.4', '5.5']
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: swift:${{ matrix.tag }}
|
||||
|
|
|
@ -26,50 +26,6 @@ jobs:
|
|||
strategy:
|
||||
matrix:
|
||||
xcode:
|
||||
- version: '11.2.1'
|
||||
- version: '11.3.1'
|
||||
- version: '11.4.1'
|
||||
- version: '11.5'
|
||||
- version: '11.6'
|
||||
- version: '11.7'
|
||||
- version: '12.0.1'
|
||||
- version: '12.1'
|
||||
- version: '12.2'
|
||||
- version: '12.4'
|
||||
xcode_flags: ['-scheme Yams -project Yams.xcodeproj']
|
||||
runs-on: macOS-10.15
|
||||
env:
|
||||
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode.version }}.app
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- run: xcodebuild -version
|
||||
- name: macOS with UTF16
|
||||
if: always()
|
||||
run: YAMS_DEFAULT_ENCODING=UTF16 xcodebuild ${{ matrix.xcode_flags }} test | xcpretty
|
||||
shell: bash
|
||||
- name: macOS with UTF8
|
||||
if: always()
|
||||
run: YAMS_DEFAULT_ENCODING=UTF8 xcodebuild ${{ matrix.xcode_flags }} test | xcpretty
|
||||
shell: bash
|
||||
- name: iPhone Simulator
|
||||
if: always()
|
||||
run: xcodebuild ${{ matrix.xcode_flags }} test -sdk iphonesimulator -destination "name=iPhone 8" | xcpretty
|
||||
shell: bash
|
||||
- name: Apple TV Simulator
|
||||
if: always()
|
||||
run: xcodebuild ${{ matrix.xcode_flags }} test -sdk appletvsimulator -destination "name=Apple TV 4K" | xcpretty
|
||||
shell: bash
|
||||
- name: watchOS Simulator
|
||||
if: always()
|
||||
run: xcodebuild ${{ matrix.xcode_flags }} build -sdk watchsimulator | xcpretty
|
||||
shell: bash
|
||||
|
||||
xcodebuild_Big_Sur:
|
||||
strategy:
|
||||
matrix:
|
||||
xcode:
|
||||
- version: '11.7'
|
||||
- version: '12.4'
|
||||
- version: '12.5.1'
|
||||
- version: '13.0'
|
||||
- version: '13.1'
|
||||
|
|
15
CHANGELOG.md
15
CHANGELOG.md
|
@ -1,3 +1,18 @@
|
|||
## Main
|
||||
|
||||
##### Breaking
|
||||
|
||||
* Swift 5.4 or later is now required to build Yams.
|
||||
[JP Simard](https://github.com/jpsim)
|
||||
|
||||
##### Enhancements
|
||||
|
||||
* None.
|
||||
|
||||
##### Bug Fixes
|
||||
|
||||
* None.
|
||||
|
||||
## 4.0.7
|
||||
|
||||
##### Breaking
|
||||
|
|
|
@ -13,7 +13,7 @@ A sweet and swifty [YAML](http://yaml.org/) parser built on
|
|||
|
||||
## Installation
|
||||
|
||||
Building Yams requires Xcode 11.x or a Swift 5.1+ toolchain with the
|
||||
Building Yams requires Xcode 12.5+ or a Swift 5.4+ toolchain with the
|
||||
Swift Package Manager or CMake and Ninja.
|
||||
|
||||
### CMake
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
// Copyright (c) 2020 Yams. All rights reserved.
|
||||
//
|
||||
|
||||
#if canImport(Combine) && compiler(>=5.2)
|
||||
#if canImport(Combine)
|
||||
import Combine
|
||||
import XCTest
|
||||
@testable import Yams
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
|
||||
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
|
||||
|
||||
http_archive(
|
||||
name = "build_bazel_rules_apple",
|
||||
sha256 = "09423d57ace0fca1b84e19326dc9aadd42f2be52f1b5a15bc652d18c2c1dee71",
|
||||
url = "https://github.com/bazelbuild/rules_apple/releases/download/0.30.0/rules_apple.0.30.0.tar.gz",
|
||||
sha256 = "a5f00fd89eff67291f6cd3efdc8fad30f4727e6ebb90718f3f05bbf3c3dd5ed7",
|
||||
url = "https://github.com/bazelbuild/rules_apple/releases/download/0.33.0/rules_apple.0.33.0.tar.gz",
|
||||
)
|
||||
|
||||
load(
|
||||
|
|
Loading…
Reference in New Issue