diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index aa253866b..b4ffbb49d 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -7,7 +7,7 @@ on: jobs: build: name: Generate docs with jazzy and publish to Github pages - runs-on: macos-12 + runs-on: macos-13 steps: - name: Checkout diff --git a/.github/workflows/env.properties b/.github/workflows/env.properties index 6c7068ba6..741ee1f16 100644 --- a/.github/workflows/env.properties +++ b/.github/workflows/env.properties @@ -1,2 +1,2 @@ -xcode_version=14.2 -ruby_version=2.7 +xcode_version=15.1 +ruby_version=3.2 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 861d525a0..a4dd6af12 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,7 +9,7 @@ on: jobs: lint: name: Lint Swift code with SwiftFormat - runs-on: macos-12 + runs-on: macos-13 steps: - name: Checkout diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 91392c48f..786eb1556 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -10,7 +10,7 @@ jobs: spm: name: "iOS ${{ matrix.sdk }}" - runs-on: macos-12 + runs-on: macos-13 strategy: fail-fast: false # Don’t fail-fast so that we get all snapshot test changes @@ -60,7 +60,7 @@ jobs: cocoapods: name: "CocoaPods" - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v1 diff --git a/.swift-version b/.swift-version index 43f030c74..b883184b1 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -5.7 \ No newline at end of file +5.9 \ No newline at end of file diff --git a/Gemfile b/Gemfile index bb2965e68..7b59a2bf4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' gem 'cocoapods', '~> 1.11' -gem 'cocoapods-generate', '~> 1.0' +gem 'cocoapods-generate', '~> 2.0' gem 'jazzy', '~> 0.13' diff --git a/Gemfile.lock b/Gemfile.lock index 5b5b41065..9053445d4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,24 +3,31 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (7.0.7.2) + activesupport (7.1.3) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - addressable (2.8.1) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) + base64 (0.2.0) + bigdecimal (3.1.6) claide (1.1.0) - cocoapods (1.12.0) + cocoapods (1.14.3) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.12.0) + cocoapods-core (= 1.14.3) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.6.0, < 2.0) + cocoapods-downloader (>= 2.1, < 3.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-trunk (>= 1.6.0, < 2.0) @@ -32,8 +39,8 @@ GEM molinillo (~> 0.8.0) nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) - xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.12.0) + xcodeproj (>= 1.23.0, < 2.0) + cocoapods-core (1.14.3) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -44,10 +51,10 @@ GEM public_suffix (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) - cocoapods-disable-podfile-validations (0.1.1) - cocoapods-downloader (1.6.3) - cocoapods-generate (1.6.0) - cocoapods-disable-podfile-validations (~> 0.1.1) + cocoapods-disable-podfile-validations (0.2.0) + cocoapods-downloader (2.1) + cocoapods-generate (2.2.5) + cocoapods-disable-podfile-validations (>= 0.1.1, < 0.3.0) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) @@ -56,53 +63,58 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + drb (2.2.0) + ruby2_keywords escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - ffi (1.15.5) + ffi (1.16.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) i18n (1.14.1) concurrent-ruby (~> 1.0) - jazzy (0.14.3) + jazzy (0.14.4) cocoapods (~> 1.5) mustache (~> 1.1) open4 (~> 1.3) redcarpet (~> 3.4) rexml (~> 3.2) - rouge (>= 2.0.6, < 4.0) + rouge (>= 2.0.6, < 5.0) sassc (~> 2.1) sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) - json (2.6.3) + json (2.7.1) liferaft (0.0.6) - mini_portile2 (2.8.1) - minitest (5.19.0) + mini_portile2 (2.8.5) + minitest (5.21.2) molinillo (0.8.0) mustache (1.1.1) + mutex_m (0.2.0) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) open4 (1.3.4) public_suffix (4.0.7) redcarpet (3.6.0) - rexml (3.2.5) - rouge (3.30.0) + rexml (3.2.6) + rouge (4.2.0) ruby-macho (2.5.1) + ruby2_keywords (0.0.5) sassc (2.4.0) ffi (~> 1.9) - sqlite3 (1.6.1) + sqlite3 (1.7.0) mini_portile2 (~> 2.8.0) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.22.0) + xcodeproj (1.23.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -115,7 +127,7 @@ PLATFORMS DEPENDENCIES cocoapods (~> 1.11) - cocoapods-generate (~> 1.0) + cocoapods-generate (~> 2.0) jazzy (~> 0.13) BUNDLED WITH diff --git a/Package.resolved b/Package.resolved index 06074d862..0111af766 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/nicklockwood/SwiftFormat", "state" : { - "revision" : "ae4d0b672cd7094ae513097c617951a5ac714418", - "version" : "0.50.8" + "revision" : "fef156a6135e584985ed26713dd2e9ee41f952cb", + "version" : "0.53.0" } } ], diff --git a/Package.swift b/Package.swift index 883ad2d1d..6ddeb155a 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.7 +// swift-tools-version:5.9 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -20,7 +20,7 @@ let package = Package( ), ], dependencies: [ - .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.50.8"), + .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.53.0"), ], targets: [ .target( diff --git a/SampleApp/Podfile.lock b/SampleApp/Podfile.lock index 011bba5a2..feb9efdb1 100644 --- a/SampleApp/Podfile.lock +++ b/SampleApp/Podfile.lock @@ -16,9 +16,9 @@ EXTERNAL SOURCES: :path: "../BlueprintUICommonControls.podspec" SPEC CHECKSUMS: - BlueprintUI: 33bad09c9cc634d9e8c9df742e2616ec8629bcf9 - BlueprintUICommonControls: 29472ce36386e43ba6d6c2b7959d0033670923f9 + BlueprintUI: 46ff8ea0328a66a4f6672fbdb606b947a1567c5f + BlueprintUICommonControls: 8f3824d01d4056dd4d9c44bba24ad1541e42c26e PODFILE CHECKSUM: c795e247aa1c5eb825186ef8192821306c59c891 -COCOAPODS: 1.12.0 +COCOAPODS: 1.14.3