Skip to content

Commit bb32674

Browse files
authored
Merge pull request #98 from nnsnodnb/xcode-15.3
Xcode 15.3
2 parents 2426222 + 892f247 commit bb32674

30 files changed

+123
-36
lines changed

.github/workflows/adhoc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
env:
1717
FASTLANE_SKIP_UPDATE_CHECK: 1
18-
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
18+
DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
1919

2020
steps:
2121
- uses: actions/checkout@v4

.github/workflows/appstore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
env:
1717
FASTLANE_SKIP_UPDATE_CHECK: 1
18-
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
18+
DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
1919

2020
steps:
2121
- uses: actions/checkout@v4

.github/workflows/renovate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
if: needs.precheck.outputs.result == 'resolve'
6060

6161
env:
62-
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
62+
DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
6363

6464
steps:
6565
- uses: Cyberbeni/install-swift-tool@v2

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: macos-14
1818

1919
env:
20-
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
20+
DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
2121

2222
steps:
2323
- uses: actions/checkout@v4

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ TLS/SSL Certificates check for iOS
1212

1313
```bash
1414
$ xcodebuild -version
15-
Xcode 15.2
16-
Build version 15C500b
15+
Xcode 15.3
16+
Build version 15E204a
1717
```
1818

1919
### Ruby

SSLCertificateCheck.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

SSLCertificateCheckPackage/Package.swift

Lines changed: 66 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,55 @@ extension PackageDescription.Target.PluginUsage {
9292
}
9393
}
9494

95+
// MARK: - SwiftSetting extension
96+
extension PackageDescription.SwiftSetting {
97+
/// Forward-scan matching for trailing closures
98+
/// - Version: Swift 5.3
99+
/// - Since: SwiftPM 5.8
100+
/// - SeeAlso: [SE-0286: Forward-scan matching for trailing closures](https://github.com/apple/swift-evolution/blob/main/proposals/0286-forward-scan-trailing-closures.md)
101+
static let forwardTrailingClosures: Self = .enableUpcomingFeature("ForwardTrailingClosures")
102+
/// Introduce existential `any`
103+
/// - Version: Swift 5.6
104+
/// - Since: SwiftPM 5.8
105+
/// - SeeAlso: [SE-0335: Introduce existential `any`](https://github.com/apple/swift-evolution/blob/main/proposals/0335-existential-any.md)
106+
static let existentialAny: Self = .enableUpcomingFeature("ExistentialAny")
107+
/// Regex Literals
108+
/// - Version: Swift 5.7
109+
/// - Since: SwiftPM 5.8
110+
/// - SeeAlso: [SE-0354: Regex Literals](https://github.com/apple/swift-evolution/blob/main/proposals/0354-regex-literals.md)
111+
static let bareSlashRegexLiterals: Self = .enableUpcomingFeature("BareSlashRegexLiterals")
112+
/// Concise magic file names
113+
/// - Version: Swift 5.8
114+
/// - Since: SwiftPM 5.8
115+
/// - SeeAlso: [SE-0274: Concise magic file names](https://github.com/apple/swift-evolution/blob/main/proposals/0274-magic-file.md)
116+
static let conciseMagicFile: Self = .enableUpcomingFeature("ConciseMagicFile")
117+
/// Importing Forward Declared Objective-C Interfaces and Protocols
118+
/// - Version: Swift 5.9
119+
/// - Since: SwiftPM 5.9
120+
/// - SeeAlso: [SE-0384: Importing Forward Declared Objective-C Interfaces and Protocols](https://github.com/apple/swift-evolution/blob/main/proposals/0384-importing-forward-declared-objc-interfaces-and-protocols.md)
121+
static let importObjcForwardDeclarations: Self = .enableUpcomingFeature("ImportObjcForwardDeclarations")
122+
/// Remove Actor Iscolation Inference caused by Property Wrappers
123+
/// - Version: Swift 5.9
124+
/// - Since: SwiftPM 5.9
125+
/// - SeeAlso: [SE-0401: Remove Actor Isolation Inference caused by Property Wrappers](https://github.com/apple/swift-evolution/blob/main/proposals/0401-remove-property-wrapper-isolation.md)
126+
static let disableOutwardActorInference: Self = .enableUpcomingFeature("DisableOutwardActorInference")
127+
/// Deprecate `@UIApplicationMain` and `@NSApplicationMain`
128+
/// - Version: Swift 5.10
129+
/// - Since: SwiftPM 5.10
130+
/// - SeeAlso: [SE-0383: Deprecate `@UIApplicationMain` and `@NSApplicationMain`](https://github.com/apple/swift-evolution/blob/main/proposals/0383-deprecate-uiapplicationmain-and-nsapplicationmain.md)
131+
static let deprecateApplicationMain: Self = .enableUpcomingFeature("DeprecateApplicationMain")
132+
/// Isolated default value expressions
133+
/// - Version: Swift 5.10
134+
/// - Since: SwiftPM 5.10
135+
/// - SeeAlso: [SE-0411: Isolated default value expressions](https://github.com/apple/swift-evolution/blob/main/proposals/0411-isolated-default-values.md)
136+
static let isolatedDefaultValues: Self = .enableUpcomingFeature("IsolatedDefaultValues")
137+
/// Strict concurrency for global variables
138+
/// - Version: Swift 5.10
139+
/// - Since: SwiftPM 5.10
140+
/// - SeeAlso: [SE-0412: Strict concurrency for global variables](https://github.com/apple/swift-evolution/blob/main/proposals/0412-strict-concurrency-for-global-variables.md)
141+
static let globalConcurrency: Self = .enableUpcomingFeature("GlobalConcurrency")
142+
}
143+
95144
let package = Package(
96145
name: .packageName,
97146
platforms: [
@@ -238,17 +287,28 @@ let debugOtherSwiftFlags = [
238287
"-strict-concurrency=complete",
239288
"-enable-actor-data-race-checks",
240289
]
290+
let upcomingFeatures: [PackageDescription.SwiftSetting] = [
291+
.forwardTrailingClosures,
292+
.existentialAny,
293+
.bareSlashRegexLiterals,
294+
.conciseMagicFile,
295+
.importObjcForwardDeclarations,
296+
.disableOutwardActorInference,
297+
.deprecateApplicationMain,
298+
.isolatedDefaultValues,
299+
.globalConcurrency,
300+
]
241301

242-
for package in package.targets {
302+
for target in package.targets {
243303
// swiftSettings
244-
package.swiftSettings = [
304+
target.swiftSettings = [
245305
.unsafeFlags(debugOtherSwiftFlags, .when(configuration: .debug)),
246-
]
306+
] + upcomingFeatures
247307
// plugins
248-
if let plugins = package.plugins {
249-
package.plugins = plugins + [.swiftLintPlugin]
308+
if let plugins = target.plugins {
309+
target.plugins = plugins + [.swiftLintPlugin]
250310
} else {
251-
package.plugins = [.swiftLintPlugin]
311+
target.plugins = [.swiftLintPlugin]
252312
}
253313
}
254314

SSLCertificateCheckPackage/Sources/AppExtensions/Share/ParseShareViewController.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// Created by Yuya Oka on 2023/10/16.
66
//
77

8+
@preconcurrency import Foundation
89
import SwiftUI
910
import UIKit
1011
import UniformTypeIdentifiers

SSLCertificateCheckPackage/Sources/Features/SearchFeature/Clients/BundleClient.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ extension BundleClient: DependencyKey {
2222
Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? ""
2323
}
2424
)
25-
package static var testValue: BundleClient = .init()
25+
package static let testValue: BundleClient = .init()
2626
}

SSLCertificateCheckPackage/Sources/Logger/Logger.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import os
99

10-
package struct Logger {
10+
package actor Logger {
1111
// MARK: - Properties
1212
private static let _logger = os.Logger(subsystem: "moe.nnsnodnb.SSLCertificateCheck", category: "Package")
1313

0 commit comments

Comments
 (0)