Skip to content

Commit 22732df

Browse files
authored
chore: Place package in standard SPM format (#495)
1 parent dbf417f commit 22732df

File tree

190 files changed

+36
-69
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+36
-69
lines changed

.github/workflows/lint.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,19 @@ on:
66
pull_request:
77
workflow_dispatch:
88

9-
env:
10-
PACKAGE_NAME: smithy-swift
11-
129
jobs:
1310
ktlint:
1411
runs-on: ubuntu-latest
1512
steps:
1613
- name: Checkout sources
1714
uses: actions/checkout@v2
18-
- name: Lint ${{ env.PACKAGE_NAME }}
19-
run: |
20-
./gradlew ktlint
15+
- name: Run ktlint
16+
run: ./gradlew ktlint
2117
swiftlint:
22-
runs-on: ubuntu-latest
18+
runs-on: macos-latest
2319
steps:
2420
- name: Checkout sources
2521
uses: actions/checkout@v2
26-
- name: Swift Lint ClientRuntime
27-
uses: norio-nomura/[email protected]
28-
with:
29-
args: --path ./Packages --config ./Packages/.swiftlint.yml
22+
- name: Run swiftlint
23+
run: swiftlint --reporter github-actions-logging
24+

.gitignore

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,36 @@
1+
# Finder config files
12
.DS_Store
3+
4+
# Build script products
25
/dist
3-
/ideaSDK
4-
/android-studio/sdk
56
out/
67
/tmp
8+
9+
# IntelliJ config & temp files
10+
/ideaSDK
11+
*.iml
12+
.idea/
13+
/android-studio/sdk
714
workspace.xml
15+
16+
# Maven config (do we need this?)
817
*.versionsBackup
18+
19+
# Gradle config & temp
920
.gradle/
10-
build/
11-
*.iml
12-
.idea/
1321
local.properties
14-
*/.build/
15-
ClientRuntime/*.xcodeproj
22+
23+
# Swift/SPM config & temp
24+
.build/
25+
/Packages
1626
Package.resolved
1727
*.hprof
1828
**/xcuserdata
1929
**/*.xcuserdata
2030
xcuserdata
21-
.build/
31+
32+
# Codegen build products
33+
build/
34+
35+
# VS Code config files
2236
.vscode

Packages/.swiftlint.yml renamed to .swiftlint.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
excluded:
2-
- ./SmithyTestUtil/*
3-
- ./ClientRuntime/Tests/*
4-
- ./Packages/SmithyTestUtil/*
5-
- ./Packages/ClientRuntime/Tests/*
62
- .build
3+
- Sources/SmithyTestUtil/*
4+
- Tests/ClientRuntimeTests/*
5+
- Tests/SmithyTestUtilTests/*
76

87
analyzer_rules:
98
- unused_import

Package.swift

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
// swift-tools-version:5.4
1+
// swift-tools-version:5.5
22

33
import PackageDescription
44

5-
65
let package = Package(
76
name: "smithy-swift",
87
platforms: [
@@ -25,23 +24,19 @@ let package = Package(
2524
.product(name: "AwsCommonRuntimeKit", package: "aws-crt-swift"),
2625
.product(name: "Logging", package: "swift-log"),
2726
.product(name: "XMLCoder", package: "XMLCoder")
28-
],
29-
path: "./Packages/ClientRuntime/Sources"
27+
]
3028
),
3129
.testTarget(
3230
name: "ClientRuntimeTests",
33-
dependencies: ["ClientRuntime", "SmithyTestUtil"],
34-
path: "./Packages/ClientRuntime/Tests"
31+
dependencies: ["ClientRuntime", "SmithyTestUtil"]
3532
),
3633
.target(
3734
name: "SmithyTestUtil",
38-
dependencies: ["ClientRuntime"],
39-
path: "./Packages/SmithyTestUtil/Sources"
35+
dependencies: ["ClientRuntime"]
4036
),
4137
.testTarget(
4238
name: "SmithyTestUtilTests",
43-
dependencies: ["SmithyTestUtil"],
44-
path: "./Packages/SmithyTestUtil/Tests"
39+
dependencies: ["SmithyTestUtil"]
4540
)
4641
]
4742
)

Packages/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 7 deletions
This file was deleted.

Packages/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDETemplateMacros.plist

Lines changed: 0 additions & 14 deletions
This file was deleted.

Packages/codecov.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)