Skip to content

Commit 8a048e6

Browse files
authored
Merge branch 'main' into patch-1
2 parents fcedb64 + 774d896 commit 8a048e6

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

.github/workflows/cd.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ on:
77

88
jobs:
99
deploy:
10+
if: false
1011
name: Deploy to CocoaPods Trunk
11-
runs-on: macos-14
12+
runs-on: macos-15
1213
steps:
1314
- name: Git Checkout
1415
uses: actions/checkout@v4
@@ -21,7 +22,7 @@ jobs:
2122
+: pod xcodes
2223

2324
- name: Select Xcode version
24-
run: sudo xcodes select 15.4
25+
run: sudo xcodes select 16.4
2526

2627
- name: Deploy to CocoaPods Trunk
2728
run: |

Sources/PlatformVersion.swift

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,9 @@ extension iOSVersion {
128128
if #available(iOS 27, *) {
129129
return .past
130130
}
131-
if #available(iOS 26, *) {
131+
// Apps built before the iOS 26 SDK get "19.0" as the system version from ProcessInfo.
132+
// Once built with the iOS 26 SDK, the version then becomes "26.0".
133+
if #available(iOS 19, *) {
132134
return .current
133135
}
134136
return .future
@@ -238,7 +240,9 @@ extension tvOSVersion {
238240
if #available(tvOS 27, *) {
239241
return .past
240242
}
241-
if #available(tvOS 26, *) {
243+
// Apps built before the tvOS 26 SDK get "19.0" as the system version from ProcessInfo.
244+
// Once built with the tvOS 26 SDK, the version then becomes "26.0".
245+
if #available(tvOS 19, *) {
242246
return .current
243247
}
244248
return .future
@@ -362,7 +366,9 @@ extension macOSVersion {
362366
if #available(macOS 27, *) {
363367
return .past
364368
}
365-
if #available(macOS 26, *) {
369+
// Apps built before the macOS 26 SDK get "16.0" as the system version from ProcessInfo.
370+
// Once built with the macOS 26 SDK, the version then becomes "26.0".
371+
if #available(macOS 16, *) {
366372
return .current
367373
}
368374
return .future
@@ -416,7 +422,9 @@ extension visionOSVersion {
416422
if #available(visionOS 27, *) {
417423
return .past
418424
}
419-
if #available(visionOS 26, *) {
425+
// Apps built before the visionOS 26 SDK get "3.0" as the system version from ProcessInfo.
426+
// Once built with the visionOS 26 SDK, the version then becomes "26.0".
427+
if #available(visionOS 3, *) {
420428
return .current
421429
}
422430
return .future

script/pod_release

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env bash
2+
3+
export LIB_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
4+
5+
echo "Publishing version $LIB_VERSION"
6+
pod trunk push SwiftUIIntrospect.podspec --allow-warnings

0 commit comments

Comments
 (0)