Skip to content

Commit

Permalink
Feature/swift 6 (#7)
Browse files Browse the repository at this point in the history
* use Swift 6

* Actions: use macos-15 & Xcode 16.1

* mark compatible with visionOS
  • Loading branch information
lukepistrol authored Nov 26, 2024
1 parent 8cdf339 commit 7d0b1d5
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .github/scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ SCHEME="TaskTrigger"
DESTINATION=$1

if [ -z "$DESTINATION" ]; then
echo "Missing argument: destination"
echo "Usage: $0 <destination>"
echo "destination: [iOS|macOS|watchOS|tvOS]"
exit 1
echo "Missing argument: destination"
echo "Usage: $0 <destination>"
echo "destination: [iOS|macOS|watchOS|tvOS|visionOS]"
exit 1
fi

set -o pipefail && xcodebuild clean build -scheme $SCHEME \
-destination "generic/platform=$DESTINATION" | xcpretty
-destination "generic/platform=$DESTINATION" | xcpretty
5 changes: 4 additions & 1 deletion .github/workflows/build-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ on:
workflow_dispatch:
workflow_call:

env:
DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer

jobs:
build-documentation:
runs-on: macos-14
runs-on: macos-15
steps:
- name: Checkout Repository
uses: actions/checkout@v4
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ on:
workflow_dispatch:
workflow_call:

env:
DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer

jobs:
build:
runs-on: macos-14
runs-on: macos-15
steps:
- name: Checkout Repository
uses: actions/checkout@v4
Expand All @@ -17,3 +20,5 @@ jobs:
run: exec ./.github/scripts/build.sh tvOS
- name: Build watchOS
run: exec ./.github/scripts/build.sh watchOS
- name: Build visionOS
run: exec ./.github/scripts/build.sh visionOS
3 changes: 2 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 5.8
// swift-tools-version: 6.0

import PackageDescription

Expand All @@ -12,6 +12,7 @@ let package = Package(
.watchOS(.v8),
.tvOS(.v15),
.macCatalyst(.v15),
.visionOS(.v1),
],
products: [
.library(
Expand Down
4 changes: 2 additions & 2 deletions TaskTriggerDemo/TaskTriggerDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.lukaspistrol.TaskTriggerDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand Down Expand Up @@ -332,7 +332,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.lukaspistrol.TaskTriggerDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down

0 comments on commit 7d0b1d5

Please sign in to comment.