From 21912af88a1b61b7c18936e1e93f3799011cc756 Mon Sep 17 00:00:00 2001 From: Jesse Squires Date: Mon, 1 Nov 2021 19:16:46 -0700 Subject: [PATCH] [Infra updates] xcode 13.1, swift 5.5, etc. (#34) - Update workflows - Xcode 13.1 - Swift 5.5 - Update bundler - Update swiftlint --- .github/workflows/ci.yml | 7 +------ .github/workflows/danger.yml | 2 +- .github/workflows/pod-lint.yml | 7 +------ Gemfile.lock | 14 ++++++++------ Nine41.podspec | 2 +- Package.swift | 2 +- README.md | 4 ++-- scripts/lint.zsh | 2 +- 8 files changed, 16 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbf4bd6..4c3f847 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 2e553ac..eb9909a 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -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: diff --git a/.github/workflows/pod-lint.yml b/.github/workflows/pod-lint.yml index 6bdc67c..3dd2e4e 100644 --- a/.github/workflows/pod-lint.yml +++ b/.github/workflows/pod-lint.yml @@ -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: diff --git a/Gemfile.lock b/Gemfile.lock index c99f45c..47417d0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -164,4 +166,4 @@ DEPENDENCIES danger-swiftlint BUNDLED WITH - 2.2.20 + 2.2.30 diff --git a/Nine41.podspec b/Nine41.podspec index c383afd..a8c0897 100644 --- a/Nine41.podspec +++ b/Nine41.podspec @@ -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' diff --git a/Package.swift b/Package.swift index c3fd866..480b7c2 100644 --- a/Package.swift +++ b/Package.swift @@ -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 diff --git a/README.md b/README.md index abb89c2..6658201 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/scripts/lint.zsh b/scripts/lint.zsh index 0687408..d2221cd 100755 --- a/scripts/lint.zsh +++ b/scripts/lint.zsh @@ -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"