Skip to content

Commit a6dbb61

Browse files
authored
Drop Xcode 14 (Swift 5.7) support (#25)
1 parent 1f3a5ef commit a6dbb61

File tree

6 files changed

+51
-70
lines changed

6 files changed

+51
-70
lines changed

.github/workflows/testing-matrix.yaml

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,10 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
include:
20-
# https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
21-
- os: macos-13
22-
xcode: 14.2
23-
platform: "iOS Simulator,OS=17.2,name=iPhone 14 Pro"
24-
- os: macos-13
25-
xcode: 14.2
26-
platform: "macOS"
27-
- os: macos-13
28-
xcode: 14.2
29-
platform: "macOS,variant=Mac Catalyst"
3020
# https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
3121
- os: macos-14
3222
xcode: 15.4
33-
platform: "iOS Simulator,OS=17.5,name=iPhone 15 Pro"
23+
platform: "iOS Simulator,name=iPhone 15 Pro,OS=17.5"
3424
- os: macos-14
3525
xcode: 15.4
3626
platform: "macOS"
@@ -39,20 +29,44 @@ jobs:
3929
platform: "macOS,variant=Mac Catalyst"
4030
- os: macos-14
4131
xcode: 15.4
42-
platform: "visionOS Simulator,name=Apple Vision Pro" # visionOS 1.2
32+
platform: "visionOS Simulator,name=Apple Vision Pro,OS=1.2"
4333
- os: macos-14
4434
xcode: 15.4
45-
platform: "tvOS Simulator,name=Apple TV"
46-
# https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
35+
platform: "tvOS Simulator,name=Apple TV,OS=17.5"
36+
37+
# https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
4738
- os: macos-15
48-
xcode: 16.1
49-
platform: "iOS Simulator,OS=18.1,name=iPhone 16 Pro"
39+
xcode: 16.4
40+
platform: "iOS Simulator,name=iPhone 16 Pro,OS=18.5"
5041
- os: macos-15
51-
xcode: 16.1
42+
xcode: 16.4
5243
platform: "macOS"
5344
- os: macos-15
54-
xcode: 16.1
45+
xcode: 16.4
5546
platform: "macOS,variant=Mac Catalyst"
47+
- os: macos-15
48+
xcode: 16.4
49+
platform: "visionOS Simulator,name=Apple Vision Pro,OS=2.5"
50+
- os: macos-15
51+
xcode: 16.4
52+
platform: "tvOS Simulator,name=Apple TV,OS=18.5"
53+
54+
# https://github.com/actions/runner-images/tree/main/images/macos
55+
# - os: macos-15
56+
# xcode: latest
57+
# platform: "iOS Simulator,name=iPhone 16 Pro,OS=26.0"
58+
- os: macos-15
59+
xcode: latest
60+
platform: "macOS"
61+
# - os: macos-15
62+
# xcode: latest
63+
# platform: "macOS,variant=Mac Catalyst"
64+
# - os: macos-15
65+
# xcode: latest
66+
# platform: "visionOS Simulator,name=Apple Vision Pro,OS=26.0"
67+
# - os: macos-15
68+
# xcode: latest
69+
# platform: "tvOS Simulator,name=Apple TV,OS=26.0"
5670

5771
runs-on: ${{ matrix.os }}
5872
timeout-minutes: 30

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.7 # Xcode 14
1+
5.9

Package.swift

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// swift-tools-version:5.7
2-
// (Xcode14.0+)
1+
// swift-tools-version:5.9
2+
// (Xcode15.0+)
33

44
import PackageDescription
55

@@ -9,6 +9,8 @@ let package = Package(
99
.iOS(.v14),
1010
.macOS(.v11),
1111
.macCatalyst(.v14),
12+
.visionOS(.v1),
13+
.tvOS(.v17),
1214
],
1315
products: [
1416
.library(
@@ -32,5 +34,8 @@ let package = Package(
3234
name: "LiveKitComponentsTests",
3335
dependencies: ["LiveKitComponents"]
3436
),
37+
],
38+
swiftLanguageVersions: [
39+
.v5,
3540
]
3641
)

[email protected]

Lines changed: 0 additions & 38 deletions
This file was deleted.

[email protected]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ let package = Package(
99
.iOS(.v14),
1010
.macOS(.v11),
1111
.macCatalyst(.v14),
12-
.tvOS(.v17),
1312
.visionOS(.v1),
13+
.tvOS(.v17),
1414
],
1515
products: [
1616
.library(

Sources/LiveKitComponents/UI/Visualizer/BarAudioVisualizer.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -180,21 +180,21 @@ extension BarAudioVisualizer {
180180

181181
func duration(agentState: AgentState) -> TimeInterval {
182182
switch agentState {
183-
case .connecting, .initializing: return 2 / Double(barCount)
184-
case .listening: return 0.5
185-
case .thinking: return 0.15
186-
case .speaking: return veryLongDuration
187-
default: return veryLongDuration
183+
case .connecting, .initializing: 2 / Double(barCount)
184+
case .listening: 0.5
185+
case .thinking: 0.15
186+
case .speaking: veryLongDuration
187+
default: veryLongDuration
188188
}
189189
}
190190

191191
func highlightingSequence(agentState: AgentState) -> [HighlightedBars] {
192192
switch agentState {
193-
case .connecting, .initializing: return (0 ..< barCount).map { HighlightedBars([$0, barCount - 1 - $0]) }
194-
case .thinking: return Array((0 ..< barCount) + (0 ..< barCount).reversed()).map { HighlightedBars([$0]) }
195-
case .listening: return barCount % 2 == 0 ? [[(barCount / 2) - 1, barCount / 2], []] : [[barCount / 2], []]
196-
case .speaking, .unknown: return [HighlightedBars(0 ..< barCount)]
197-
case .disconnected: return [[]]
193+
case .connecting, .initializing: (0 ..< barCount).map { HighlightedBars([$0, barCount - 1 - $0]) }
194+
case .thinking: Array((0 ..< barCount) + (0 ..< barCount).reversed()).map { HighlightedBars([$0]) }
195+
case .listening: barCount % 2 == 0 ? [[(barCount / 2) - 1, barCount / 2], []] : [[barCount / 2], []]
196+
case .speaking, .unknown: [HighlightedBars(0 ..< barCount)]
197+
case .disconnected: [[]]
198198
}
199199
}
200200
}

0 commit comments

Comments
 (0)