Skip to content

Apply standard Swift package configuration #12

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
merged 1 commit into from
Dec 15, 2023
Merged

Apply standard Swift package configuration #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/artifactory.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
tags: ['[0-9]+.[0-9]+.[0-9]+']

env:
DEVELOPER_DIR: /Applications/Xcode_14.3.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer

jobs:
artifactory:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bazel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches: [ main ]

env:
DEVELOPER_DIR: /Applications/Xcode_14.3.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer

jobs:
bazel:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/swift.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches: [ main ]

env:
DEVELOPER_DIR: /Applications/Xcode_14.3.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer

jobs:
swift:
Expand All @@ -29,5 +29,5 @@ jobs:
run: xcodebuild -resolvePackageDependencies
- name: Build
run: xcodebuild build-for-testing -scheme "CombineUI" -destination "name=$SIMULATOR,OS=latest"
- name: Run tests
- name: Test
run: xcodebuild test-without-building -scheme "CombineUI" -destination "name=$SIMULATOR,OS=latest"
5 changes: 4 additions & 1 deletion .swiftlint-rules.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ only_rules:
- anonymous_argument_in_multiline_closure
- anyobject_protocol
- array_init
- attributes
# - attributes
- balanced_xctest_lifecycle
- blanket_disable_command
- block_based_kvo
Expand Down Expand Up @@ -129,6 +129,7 @@ only_rules:
- no_grouping_extension
# - no_magic_numbers
- no_space_in_method_call
- non_overridable_class_declaration
- notification_center_detachment
- ns_number_init_as_function_reference
- nslocalizedstring_key
Expand All @@ -154,6 +155,7 @@ only_rules:
- private_outlet
- private_over_fileprivate
- private_subject
- private_swiftui_state
- private_unit_test
- prohibited_interface_builder
- prohibited_super_call
Expand Down Expand Up @@ -209,6 +211,7 @@ only_rules:
- unavailable_function
- unhandled_throwing_task
- unneeded_break_in_switch
# - unneeded_override
- unneeded_parentheses_in_closure_argument
- unneeded_synthesized_initializer
- unowned_variable_capture
Expand Down
8 changes: 4 additions & 4 deletions 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 Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.8
// swift-tools-version:5.9

import PackageDescription

Expand All @@ -22,7 +22,7 @@ let package = Package(
dependencies: [
.package(
url: "https://github.com/Quick/Nimble.git",
from: "12.0.0"),
from: "13.0.0"),
],
targets: [
.target(
Expand Down Expand Up @@ -51,7 +51,7 @@ let package = Package(
path: "Plugins/SwiftLintPlugin"),
.binaryTarget(
name: SwiftLint.binary,
url: "https://github.com/realm/SwiftLint/releases/download/0.52.4/SwiftLintBinary-macos.artifactbundle.zip",
checksum: "8a8095e6235a07d00f34a9e500e7568b359f6f66a249f36d12cd846017a8c6f5"),
url: "https://github.com/realm/SwiftLint/releases/download/0.54.0/SwiftLintBinary-macos.artifactbundle.zip",
checksum: "963121d6babf2bf5fd66a21ac9297e86d855cbc9d28322790646b88dceca00f1"),
]
)
9 changes: 7 additions & 2 deletions Plugins/SwiftLintPlugin/SwiftLintPlugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ internal struct SwiftLintPlugin: BuildToolPlugin {
target: Target
) throws -> [String: String] {

let workingDirectory: Path = try target.directory.resolveWorkingDirectory(in: context.package.directory)
let workingDirectory: Path = try target
.directory
.resolveWorkingDirectory(in: context.package.directory)

return ["BUILD_WORKSPACE_DIRECTORY": "\(workingDirectory)"]
}
Expand All @@ -76,9 +78,12 @@ internal struct SwiftLintPlugin: BuildToolPlugin {

print("Environment:", environment)

guard !swiftFiles.isEmpty
else { return [] }

let arguments: [String] = ["lint", "--quiet", "--force-exclude", "--cache-path", "\(path)"]

return swiftFiles.isEmpty ? [] : [
return [
.prebuildCommand(
displayName: "SwiftLint",
executable: executable.path,
Expand Down