Skip to content

Commit

Permalink
[#156] Switched to Swift 6 (#157)
Browse files Browse the repository at this point in the history
* Updated tools version to Swift 6
* Updated Swift version in the podspec
* Removed Swift 5.x from GHA workflows
* Switched the Linux image to Ubuntu 24.04
  • Loading branch information
yakovmanshin authored Sep 25, 2024
1 parent 384b467 commit c76f384
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
10 changes: 2 additions & 8 deletions .github/workflows/Common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,11 @@ jobs:
runs-on: ${{ matrix.OS }}
strategy:
matrix:
SWIFT_VERSION: ["6.0", "5.10", "5.9"]
SWIFT_VERSION: ["6.0"]
include:
- SWIFT_VERSION: "6.0"
OS: macos-14
XCODE_APP_NAME: "Xcode_16.0"
- SWIFT_VERSION: "5.10"
OS: macos-14
XCODE_APP_NAME: "Xcode_15.3"
- SWIFT_VERSION: "5.9"
OS: macos-13
XCODE_APP_NAME: "Xcode_15.2"
steps:
- uses: actions/checkout@v4
- name: Select Xcode Version
Expand All @@ -44,7 +38,7 @@ jobs:
swift test -v
spm_tests_linux:
name: SPM Tests (Linux)
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Run Tests
Expand Down
5 changes: 3 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 5.9
// swift-tools-version: 6.0

import PackageDescription

Expand Down Expand Up @@ -26,7 +26,8 @@ let package = Package(
dependencies: ["YMFF"],
swiftSettings: swiftSettings
),
]
],
swiftLanguageModes: [.v5, .v6]
)

fileprivate let swiftSettings: [SwiftSetting] = [
Expand Down
2 changes: 1 addition & 1 deletion YMFF.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Pod::Spec.new do |s|

s.name = "YMFF"
s.version = "4.0.0"
s.swift_version = "5.9"
s.swift_version = "6.0"
s.authors = { "Yakov Manshin" => "git@yakovmanshin.com" }
s.license = { :type => "Apache License, version 2.0", :file => "LICENSE" }
s.homepage = "https://github.com/yakovmanshin/YMFF"
Expand Down

0 comments on commit c76f384

Please sign in to comment.