Skip to content

Commit a1535a9

Browse files
committed
Fixes for Swift 6 (#6)
1 parent a17e507 commit a1535a9

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
- uses: maxim-lobanov/setup-xcode@v1
2727
with:
28-
xcode-version: 15.3
28+
xcode-version: '16.0-beta'
2929
- uses: actions/checkout@v4
3030
- name: SPM tests
3131
run: make test

SourceMapper.xcodeproj/project.pbxproj

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@
384384
MTL_FAST_MATH = YES;
385385
PRODUCT_NAME = "$(TARGET_NAME)";
386386
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
387-
SWIFT_VERSION = 5.0;
387+
SWIFT_VERSION = 6.0;
388388
};
389389
name = Debug;
390390
};
@@ -436,7 +436,7 @@
436436
MTL_ENABLE_DEBUG_INFO = NO;
437437
MTL_FAST_MATH = YES;
438438
PRODUCT_NAME = "$(TARGET_NAME)";
439-
SWIFT_VERSION = 5.0;
439+
SWIFT_VERSION = 6.0;
440440
};
441441
name = Release;
442442
};
@@ -461,7 +461,7 @@
461461
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
462462
SKIP_INSTALL = YES;
463463
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)";
464-
SWIFT_VERSION = 5.0;
464+
SWIFT_VERSION = 6.0;
465465
TARGET_NAME = SourceMapper;
466466
TVOS_DEPLOYMENT_TARGET = 9.0;
467467
WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -489,7 +489,7 @@
489489
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
490490
SKIP_INSTALL = YES;
491491
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)";
492-
SWIFT_VERSION = 5.0;
492+
SWIFT_VERSION = 6.0;
493493
TARGET_NAME = SourceMapper;
494494
TVOS_DEPLOYMENT_TARGET = 9.0;
495495
WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -520,6 +520,7 @@
520520
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) SWIFT_PACKAGE DEBUG";
521521
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
522522
SWIFT_STRICT_CONCURRENCY = complete;
523+
SWIFT_VERSION = 6.0;
523524
USE_HEADERMAP = NO;
524525
};
525526
name = Debug;
@@ -542,7 +543,7 @@
542543
OTHER_LDFLAGS = "$(inherited)";
543544
OTHER_SWIFT_FLAGS = "$(inherited)";
544545
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)";
545-
SWIFT_VERSION = 5.0;
546+
SWIFT_VERSION = 6.0;
546547
TARGET_NAME = SourceMapperTests;
547548
TVOS_DEPLOYMENT_TARGET = 9.0;
548549
WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -567,7 +568,7 @@
567568
OTHER_LDFLAGS = "$(inherited)";
568569
OTHER_SWIFT_FLAGS = "$(inherited)";
569570
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)";
570-
SWIFT_VERSION = 5.0;
571+
SWIFT_VERSION = 6.0;
571572
TARGET_NAME = SourceMapperTests;
572573
TVOS_DEPLOYMENT_TARGET = 9.0;
573574
WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -595,6 +596,7 @@
595596
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) SWIFT_PACKAGE";
596597
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
597598
SWIFT_STRICT_CONCURRENCY = complete;
599+
SWIFT_VERSION = 6.0;
598600
USE_HEADERMAP = NO;
599601
};
600602
name = Release;

Tests/SourceMapperTests/TestHelpers.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ extension SourceMap {
1414
try self.init(try Data(contentsOf: url))
1515
}
1616

17-
static let fixturesURL = URL(fileURLWithPath: #file)
17+
static let fixturesURL = URL(fileURLWithPath: #filePath)
1818
.deletingLastPathComponent()
1919
.appendingPathComponent("Fixtures")
2020

0 commit comments

Comments
 (0)