Skip to content

Commit 8aad617

Browse files
authored
Move CI to Swift 6.2 (#9)
1 parent 8fb4bd6 commit 8aad617

File tree

2 files changed

+6
-24
lines changed

2 files changed

+6
-24
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: Linux SPM unit tests
1414
runs-on: ubuntu-latest
1515
container:
16-
image: swift:6.1
16+
image: swift:6.2
1717
steps:
1818
- uses: actions/checkout@v4
1919
with:
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828
- uses: maxim-lobanov/setup-xcode@v1
2929
with:
30-
xcode-version: '16.3'
30+
xcode-version: '26.1.0-beta'
3131
- uses: actions/checkout@v4
3232
with:
3333
persist-credentials: false
@@ -47,8 +47,8 @@ jobs:
4747
steps:
4848
- uses: compnerd/gha-setup-swift@main
4949
with:
50-
branch: swift-6.1-release
51-
tag: 6.1-RELEASE
50+
branch: swift-6.2-release
51+
tag: 6.2-RELEASE
5252
- uses: actions/checkout@v4
5353
with:
5454
persist-credentials: false

SourceMapper.xcodeproj/project.pbxproj

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,6 @@
379379
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
380380
GCC_WARN_UNUSED_FUNCTION = YES;
381381
GCC_WARN_UNUSED_VARIABLE = YES;
382-
MACOSX_DEPLOYMENT_TARGET = 13.0;
383382
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
384383
MTL_FAST_MATH = YES;
385384
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -432,7 +431,6 @@
432431
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
433432
GCC_WARN_UNUSED_FUNCTION = YES;
434433
GCC_WARN_UNUSED_VARIABLE = YES;
435-
MACOSX_DEPLOYMENT_TARGET = 13.0;
436434
MTL_ENABLE_DEBUG_INFO = NO;
437435
MTL_FAST_MATH = YES;
438436
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -450,9 +448,7 @@
450448
);
451449
HEADER_SEARCH_PATHS = "$(inherited)";
452450
INFOPLIST_FILE = SourceMapper.xcodeproj/SourceMapper_Info.plist;
453-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
454451
LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
455-
MACOSX_DEPLOYMENT_TARGET = 13.0;
456452
OTHER_CFLAGS = "$(inherited)";
457453
OTHER_LDFLAGS = "$(inherited)";
458454
OTHER_SWIFT_FLAGS = "$(inherited)";
@@ -463,8 +459,6 @@
463459
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)";
464460
SWIFT_VERSION = 6.0;
465461
TARGET_NAME = SourceMapper;
466-
TVOS_DEPLOYMENT_TARGET = 9.0;
467-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
468462
};
469463
name = Debug;
470464
};
@@ -478,9 +472,7 @@
478472
);
479473
HEADER_SEARCH_PATHS = "$(inherited)";
480474
INFOPLIST_FILE = SourceMapper.xcodeproj/SourceMapper_Info.plist;
481-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
482475
LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
483-
MACOSX_DEPLOYMENT_TARGET = 13.0;
484476
OTHER_CFLAGS = "$(inherited)";
485477
OTHER_LDFLAGS = "$(inherited)";
486478
OTHER_SWIFT_FLAGS = "$(inherited)";
@@ -491,8 +483,6 @@
491483
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)";
492484
SWIFT_VERSION = 6.0;
493485
TARGET_NAME = SourceMapper;
494-
TVOS_DEPLOYMENT_TARGET = 9.0;
495-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
496486
};
497487
name = Release;
498488
};
@@ -511,7 +501,7 @@
511501
"SWIFT_PACKAGE=1",
512502
"DEBUG=1",
513503
);
514-
MACOSX_DEPLOYMENT_TARGET = 13.0;
504+
MACOSX_DEPLOYMENT_TARGET = 15.6;
515505
ONLY_ACTIVE_ARCH = YES;
516506
OTHER_SWIFT_FLAGS = "$(inherited) -DXcode";
517507
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -536,17 +526,13 @@
536526
);
537527
HEADER_SEARCH_PATHS = "$(inherited)";
538528
INFOPLIST_FILE = SourceMapper.xcodeproj/SourceMapperTests_Info.plist;
539-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
540529
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/../Frameworks @loader_path/Frameworks";
541-
MACOSX_DEPLOYMENT_TARGET = 13.0;
542530
OTHER_CFLAGS = "$(inherited)";
543531
OTHER_LDFLAGS = "$(inherited)";
544532
OTHER_SWIFT_FLAGS = "$(inherited)";
545533
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)";
546534
SWIFT_VERSION = 6.0;
547535
TARGET_NAME = SourceMapperTests;
548-
TVOS_DEPLOYMENT_TARGET = 9.0;
549-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
550536
};
551537
name = Debug;
552538
};
@@ -561,17 +547,13 @@
561547
);
562548
HEADER_SEARCH_PATHS = "$(inherited)";
563549
INFOPLIST_FILE = SourceMapper.xcodeproj/SourceMapperTests_Info.plist;
564-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
565550
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @loader_path/../Frameworks @loader_path/Frameworks";
566-
MACOSX_DEPLOYMENT_TARGET = 13.0;
567551
OTHER_CFLAGS = "$(inherited)";
568552
OTHER_LDFLAGS = "$(inherited)";
569553
OTHER_SWIFT_FLAGS = "$(inherited)";
570554
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)";
571555
SWIFT_VERSION = 6.0;
572556
TARGET_NAME = SourceMapperTests;
573-
TVOS_DEPLOYMENT_TARGET = 9.0;
574-
WATCHOS_DEPLOYMENT_TARGET = 2.0;
575557
};
576558
name = Release;
577559
};
@@ -588,7 +570,7 @@
588570
"$(inherited)",
589571
"SWIFT_PACKAGE=1",
590572
);
591-
MACOSX_DEPLOYMENT_TARGET = 13.0;
573+
MACOSX_DEPLOYMENT_TARGET = 15.6;
592574
OTHER_SWIFT_FLAGS = "$(inherited) -DXcode";
593575
PRODUCT_NAME = "$(TARGET_NAME)";
594576
SDKROOT = macosx;

0 commit comments

Comments
 (0)