Skip to content

Move to Xcode 26.2 / Swift 6.2 and com.istorry bundle IDs #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iStorry merged 2 commits into from
Oct 29, 2026
Merged

Move to Xcode 26.2 / Swift 6.2 and com.istorry bundle IDs #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6193539
Move to Xcode 26.2 / Swift 6.2 and com.istorry bundle IDs
iStorry Oct 29, 2026
9bbf508
Add macOS CI: pinned SwiftLint and Xcode 26.2 builds
iStorry Oct 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: CI

on:
pull_request:
push:
branches: [main]
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

permissions:
contents: read

env:
DEVELOPER_DIR: /Applications/Xcode_26.2.app/Contents/Developer
SWIFTLINT_VERSION: 0.65.1
SWIFTLINT_SHA256: c1e429b0599cf1b516f369a2d9ec04eaf0e436f3c12b637df8851fa52ff694d0

jobs:
build:
name: Lint and Build
runs-on: macos-26
timeout-minutes: 30
steps:
- uses: actions/checkout@v7

- name: Install SwiftLint
run: |
curl -fsSL -o "$RUNNER_TEMP/swiftlint.zip" \
"https://github.com/realm/SwiftLint/releases/download/$SWIFTLINT_VERSION/portable_swiftlint.zip"
echo "$SWIFTLINT_SHA256 $RUNNER_TEMP/swiftlint.zip" | shasum -a 256 -c -
unzip -q "$RUNNER_TEMP/swiftlint.zip" -d "$RUNNER_TEMP/swiftlint"
echo "$RUNNER_TEMP/swiftlint" >> "$GITHUB_PATH"

- name: Lint
run: swiftlint --strict --reporter github-actions-logging

- name: Cache Swift packages
uses: actions/cache@v6
with:
path: .build/SourcePackages
key: spm-${{ hashFiles('Whisky.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved', 'WhiskyKit/Package.swift') }}

- name: Build Whisky
run: xcodebuild build -project Whisky.xcodeproj -scheme Whisky -configuration Release
-clonedSourcePackagesDirPath .build/SourcePackages -disableAutomaticPackageResolution
CODE_SIGNING_ALLOWED=NO CODE_SIGN_IDENTITY=""

- name: Build WhiskyCmd
run: xcodebuild build -project Whisky.xcodeproj -scheme WhiskyCmd -configuration Release
-clonedSourcePackagesDirPath .build/SourcePackages -disableAutomaticPackageResolution
CODE_SIGNING_ALLOWED=NO CODE_SIGN_IDENTITY=""
20 changes: 0 additions & 20 deletions .github/workflows/SwiftLint.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .swiftlint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ opt_in_rules:
- file_header

excluded:
- .build
- "**/.build"

file_header:
severity: error
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Whisky 🥃
*Wine but a bit stronger*

![](https://img.shields.io/github/actions/workflow/status/IsaacMarovitz/Whisky/SwiftLint.yml?style=for-the-badge)
![](https://img.shields.io/github/actions/workflow/status/iStorry/Whisky/CI.yml?branch=main&style=for-the-badge)
[![](https://img.shields.io/discord/1115955071549702235?style=for-the-badge)](https://discord.gg/CsqAfs9CnM)
</div>

Expand Down
28 changes: 14 additions & 14 deletions Whisky.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,8 +474,8 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1500;
LastUpgradeCheck = 1600;
LastSwiftUpdateCheck = 2620;
LastUpgradeCheck = 2620;
TargetAttributes = {
6E40495129CCA19C006E3F1B = {
CreatedOnToolsVersion = 14.2;
Expand Down Expand Up @@ -688,6 +688,7 @@
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
Expand All @@ -709,6 +710,7 @@
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
Expand Down Expand Up @@ -753,6 +755,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -766,6 +769,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = macosx;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
};
Expand All @@ -785,9 +789,9 @@
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"Whisky/Preview Content\"";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = 92S3SG4PTH;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Whisky/Info.plist;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
Expand All @@ -801,7 +805,7 @@
);
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.3.5;
PRODUCT_BUNDLE_IDENTIFIER = com.isaacmarovitz.Whisky;
PRODUCT_BUNDLE_IDENTIFIER = com.istorry.Whisky;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand All @@ -824,9 +828,9 @@
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"Whisky/Preview Content\"";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = 92S3SG4PTH;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Whisky/Info.plist;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
Expand All @@ -840,7 +844,7 @@
);
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.3.5;
PRODUCT_BUNDLE_IDENTIFIER = com.isaacmarovitz.Whisky;
PRODUCT_BUNDLE_IDENTIFIER = com.istorry.Whisky;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = Whisky;
Expand All @@ -859,15 +863,14 @@
CODE_SIGN_STYLE = Manual;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = 92S3SG4PTH;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GENERATE_PKGINFO_FILE = NO;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 14.0;
PRODUCT_BUNDLE_IDENTIFIER = com.isaacmarovitz.WhiskyCmd;
PRODUCT_BUNDLE_IDENTIFIER = com.istorry.WhiskyCmd;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
Expand All @@ -886,15 +889,14 @@
CODE_SIGN_STYLE = Manual;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = 92S3SG4PTH;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GENERATE_PKGINFO_FILE = NO;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 14.0;
PRODUCT_BUNDLE_IDENTIFIER = com.isaacmarovitz.WhiskyCmd;
PRODUCT_BUNDLE_IDENTIFIER = com.istorry.WhiskyCmd;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
Expand All @@ -913,7 +915,6 @@
CURRENT_PROJECT_VERSION = 43;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = 92S3SG4PTH;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
Expand All @@ -928,7 +929,7 @@
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 2.3.5;
PRODUCT_BUNDLE_IDENTIFIER = com.isaacmarovitz.Whisky.WhiskyThumbnail;
PRODUCT_BUNDLE_IDENTIFIER = com.istorry.Whisky.WhiskyThumbnail;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
Expand All @@ -949,7 +950,6 @@
CURRENT_PROJECT_VERSION = 43;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = 92S3SG4PTH;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
Expand All @@ -964,7 +964,7 @@
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 2.3.5;
PRODUCT_BUNDLE_IDENTIFIER = com.isaacmarovitz.Whisky.WhiskyThumbnail;
PRODUCT_BUNDLE_IDENTIFIER = com.istorry.Whisky.WhiskyThumbnail;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
Expand Down
2 changes: 1 addition & 1 deletion Whisky.xcodeproj/xcshareddata/xcschemes/Whisky.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1600"
LastUpgradeVersion = "2620"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Whisky.xcodeproj/xcshareddata/xcschemes/WhiskyCmd.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1600"
LastUpgradeVersion = "2620"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Whisky.xcodeproj/xcshareddata/xcschemes/WhiskyThumbnail.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1600"
LastUpgradeVersion = "2620"
version = "2.0">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
9 changes: 5 additions & 4 deletions WhiskyKit/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions WhiskyKit/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// swift-tools-version: 5.9
// swift-tools-version: 6.2
//
// PortableExecutable.swift
// Package.swift
// WhiskyKit
//
// This file is part of Whisky.
Expand Down Expand Up @@ -31,13 +31,13 @@ let package = Package(
)
],
dependencies: [
.package(url: "git@github.com:SwiftPackageIndex/SemanticVersion.git", from: "0.3.0")
.package(url: "https://github.com/SwiftPackageIndex/SemanticVersion.git", from: "0.3.0")
],
targets: [
.target(
name: "WhiskyKit",
dependencies: ["SemanticVersion"]
)
],
swiftLanguageVersions: [.version("6")]
swiftLanguageModes: [.v6]
)
2 changes: 1 addition & 1 deletion WhiskyKit/Sources/WhiskyKit/Extensions/Bundle+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ import Foundation

public extension Bundle {
static var whiskyBundleIdentifier: String {
return Bundle.main.bundleIdentifier ?? "com.isaacmarovitz.Whisky"
return Bundle.main.bundleIdentifier ?? "com.istorry.Whisky"
}
}
Loading