Skip to content

Commit

Permalink
Merge pull request #26 from elegantchaos/swift-5
Browse files Browse the repository at this point in the history
Updated to Swift 5. Fixed warnings. Added GitHub Actions support.
  • Loading branch information
samdeane authored Nov 26, 2019
2 parents e1468d4 + b52151f commit 2e577ab
Show file tree
Hide file tree
Showing 13 changed files with 211 additions and 184 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/swift.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Swift

on: [push]

jobs:
build:

runs-on: macOS-latest

steps:
- uses: actions/checkout@v1
- name: List Apps
run: ls /Applications
- name: Swift Version
run: swift --version
- name: Select Xcode
run: sudo xcode-select -s /Applications/Xcode_11.2.1.app
- name: Run tests
run: swift test
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

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

4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
os: osx
osx_image: xcode9.2
osx_image: xcode11.2
language: swift
install:
- swift package update
script:
- swift test -Xswiftc -target -Xswiftc x86_64-apple-macosx10.12
- swift test
notifications:
slack:
secure: TsKpblxP1gz+o1HcJ+2Lw8U3gLfFhWSp6XzJwOOcB9TGfRYVm3kVhy0wzCK8q0V2+Eh8amXhj8oguvbP10GH4Ru+h1bH+p+tp/nfSbh9n7WwC3zArdoNqYxIre7KQ1cuEaoDspRgqKw27/aMBLcbmkzt2b3eAWjpFMnbHNKnIyjz1XNZR2WnQ0IJWvCYVBX/wmQ3d2w7nZ4UTyIh83FwfTYAPQVmlIY7saaTx7/rWit7u8LFGR61cjDgTVbqjJ+vXR+CZqp+KoAPHhhZBchNVv57vH3MjvWYoQ2iPVU3VjvBXTFD700lQBWDdYQ1w7Ew4nzCEr6DHGKO8FvDlna/rW2UDRbQuK5Qn0kPAjMUpTUlJIo+2O7SK6PGRqRCirJ65uOhrJFasWL0kPx4QC8PeUXMVUTYK86Xj17IlwPFIRoe+caqyG30KOCf209Zt0o3FokzUS/FU0Ca9KyejP+US/FF6G9QWc4txlXtTNOV1+jxZWi44AC4G56A1Ik8lCCPjaMH/vz7nbM35oYtkZJ9TPCRXBh1E7j2rQu8Bx6FqKlw1cO7MaxZA5XJF6aOWHWZpNtPkVzluZ3UrILt++QazzTL45Jn/BOlw4F4g6jeZTB26j7Z6VIlyYmoTkywE4IYDovASos4XRFTAGl44TZV3LYz/em4FZKP5OdQ34g34a4=
4 changes: 2 additions & 2 deletions DictionaryCoding.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'DictionaryCoding'
s.version = '1.0.6'
s.version = '1.0.7'
s.summary = 'Swift Decoder/Encoder which converts to/from dictionaries.'

s.description = <<-DESC
Expand All @@ -14,7 +14,7 @@ It allows you to take a native swift class or struct that confirms to the Codabl
s.author = { 'Sam Deane' => '[email protected]' }
s.source = { :git => 'https://github.com/elegantchaos/DictionaryCoding.git', :tag => s.version.to_s }

s.swift_version = "4.1"
s.swift_version = "5.0"
s.osx.deployment_target = "10.12"
s.ios.deployment_target = "10.0"

Expand Down
1 change: 1 addition & 0 deletions DictionaryCoding.xcconfig
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
IPHONEOS_DEPLOYMENT_TARGET = 10.0
MACOSX_DEPLOYMENT_TARGET = 10.12
APPLICATION_EXTENSION_API_ONLY = YES
Loading

0 comments on commit 2e577ab

Please sign in to comment.