Skip to content

Commit

Permalink
[Infra updates] xcode 13.1, swift 5.5, etc. (#34)
Browse files Browse the repository at this point in the history
- Update workflows
- Xcode 13.1
- Swift 5.5
- Update bundler
- Update swiftlint
  • Loading branch information
jessesquires committed Nov 2, 2021
1 parent 9303723 commit 21912af
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 24 deletions.
7 changes: 1 addition & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,9 @@ on:
pull_request:
branches:
- main
paths:
- '.github/workflows/ci.yml'
- 'Package*'
- 'Sources/**/*.*'
- 'Tests/**/*.*'

env:
DEVELOPER_DIR: /Applications/Xcode_12.5.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_13.1.app/Contents/Developer

jobs:
main:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/danger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
types: [synchronize, opened, reopened, labeled, unlabeled, edited]

env:
DEVELOPER_DIR: /Applications/Xcode_12.5.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_13.1.app/Contents/Developer

jobs:
main:
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/pod-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,9 @@ on:
pull_request:
branches:
- main
paths:
- '.github/workflows/pod-lint.yml'
- '*.podspec'
- 'Gemfile*'
- 'Sources/**/*.*'

env:
DEVELOPER_DIR: /Applications/Xcode_12.5.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_13.1.app/Contents/Developer

jobs:
main:
Expand Down
14 changes: 8 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.3)
CFPropertyList (3.0.4)
rexml
activesupport (6.1.4.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
Expand Down Expand Up @@ -60,7 +61,7 @@ GEM
concurrent-ruby (1.1.9)
cork (0.3.0)
colored2 (~> 3.1)
danger (8.4.0)
danger (8.4.1)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
Expand All @@ -80,7 +81,7 @@ GEM
rake (> 10)
thor (~> 0.19)
escape (0.0.4)
ethon (0.14.0)
ethon (0.15.0)
ffi (>= 1.15.0)
faraday (1.8.0)
faraday-em_http (~> 1.0)
Expand Down Expand Up @@ -112,7 +113,7 @@ GEM
httpclient (2.8.3)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
json (2.5.1)
json (2.6.1)
kramdown (2.3.1)
rexml
kramdown-parser-gfm (1.1.0)
Expand Down Expand Up @@ -152,10 +153,11 @@ GEM
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
zeitwerk (2.4.2)
zeitwerk (2.5.1)

PLATFORMS
ruby
x86_64-linux

DEPENDENCIES
cocoapods (~> 1.11)
Expand All @@ -164,4 +166,4 @@ DEPENDENCIES
danger-swiftlint

BUNDLED WITH
2.2.20
2.2.30
2 changes: 1 addition & 1 deletion Nine41.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Pod::Spec.new do |s|
s.source = { :git => 'https://github.com/jessesquires/Nine41.git', :tag => s.version }
s.source_files = 'Sources/**/*'

s.swift_version = '5.4'
s.swift_version = '5.5'

s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.15'
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.4
// swift-tools-version:5.5
// The swift-tools-version declares the minimum version of Swift required to build this package.

// GitHub
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ This script fixes most of those issues. It overrides the status bars for all cur

## Requirements

- Swift 5.4+
- Xcode 12.5+
- Swift 5.5+
- Xcode 13.0+
- [SwiftLint](https://github.com/realm/SwiftLint)

## Installation
Expand Down
2 changes: 1 addition & 1 deletion scripts/lint.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
PROJECT="Nine41.xcodeproj"
SCHEME="Nine41"

VERSION="0.43.1"
VERSION="0.45.0"

FOUND=$(swiftlint version)
LINK="https://github.com/realm/SwiftLint"
Expand Down

0 comments on commit 21912af

Please sign in to comment.