Skip to content

Enable Swift 6 language mode #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mbernson wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Enable Swift 6 language mode #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7452685
Enable Swift 6 language mode
mbernson Jul 24, 2026
302fd1c
Rewrite unit test to Swift Testing
mbernson Jul 24, 2026
7489999
Set screenshot tests to Swift 5 language mode
mbernson Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CCCApi/Sources/CCCApi/MediaCCCApiClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import Foundation
import os.log

public final class MediaCCCApiClient {
public final class MediaCCCApiClient: Sendable {
private let session: URLSession
private let baseURL = URL(string: "https://api.media.ccc.de/public")!
private let decoder = JSONDecoder()
Expand Down
6 changes: 4 additions & 2 deletions HackerTube.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@
SWIFT_APPROACHABLE_CONCURRENCY = YES;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 6.0;
TVOS_DEPLOYMENT_TARGET = 18.6;
XROS_DEPLOYMENT_TARGET = 26.0;
};
Expand Down Expand Up @@ -602,7 +602,7 @@
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 6.0;
TVOS_DEPLOYMENT_TARGET = 18.6;
VALIDATE_PRODUCT = YES;
XROS_DEPLOYMENT_TARGET = 26.0;
Expand Down Expand Up @@ -706,6 +706,7 @@
SUPPORTS_MACCATALYST = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3";
TEST_TARGET_NAME = HackerTube;
};
Expand All @@ -725,6 +726,7 @@
SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,3";
TEST_TARGET_NAME = HackerTube;
};
Expand Down
34 changes: 20 additions & 14 deletions HackerTubeTests/URLParserTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,33 @@
// Created by Mathijs Bernson on 30/07/2022.
//

import XCTest
import Foundation
import Testing

@testable import HackerTube

class URLParserTests: XCTestCase {
let parser = URLParser()
@Suite("URLParser")
struct URLParserTests {
private let parser = URLParser()

func testParseOpenURL() {
let url = URL(string: "ccctube://talk/44ab627f-ed5d-522b-b84b-15a3ed761895")!
XCTAssertEqual(parser.parseURL(url), .openTalk(id: "44ab627f-ed5d-522b-b84b-15a3ed761895"))
@Test func parseOpenURL() throws {
let url = try #require(URL(string: "ccctube://talk/44ab627f-ed5d-522b-b84b-15a3ed761895"))
#expect(parser.parseURL(url) == .openTalk(id: "44ab627f-ed5d-522b-b84b-15a3ed761895"))
}

func testParsePlayURL() {
let url = URL(string: "ccctube://talk/44ab627f-ed5d-522b-b84b-15a3ed761895/play")!
XCTAssertEqual(parser.parseURL(url), .playTalk(id: "44ab627f-ed5d-522b-b84b-15a3ed761895"))
@Test func parsePlayURL() throws {
let url = try #require(URL(string: "ccctube://talk/44ab627f-ed5d-522b-b84b-15a3ed761895/play"))
#expect(parser.parseURL(url) == .playTalk(id: "44ab627f-ed5d-522b-b84b-15a3ed761895"))
}

func testInvalidURLs() {
XCTAssertNil(parser.parseURL(URL(string: "ccctube://")!))
XCTAssertNil(parser.parseURL(URL(string: "https://google.com/")!))
XCTAssertNil(parser.parseURL(URL(string: "ccctube://foo")!))
XCTAssertNil(parser.parseURL(URL(string: "mailto:info@example.com")!))
@Test(arguments: [
"ccctube://",
"https://google.com/",
"ccctube://foo",
"mailto:info@example.com",
])
func invalidURLs(urlString: String) throws {
let url = try #require(URL(string: urlString))
#expect(parser.parseURL(url) == nil)
}
}