Skip to content

Commit a436268

Browse files
JeehutJeehut
committed
Update CI config & cleanup .gitignore file
1 parent 63df33b commit a436268

File tree

4 files changed

+69
-212
lines changed

4 files changed

+69
-212
lines changed

‎.github/workflows/main.yml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name: CI
33
on:
44
push:
55
branches: [main, versions]
6-
76
pull_request:
87
branches: [main]
98

@@ -28,11 +27,28 @@ jobs:
2827
with:
2928
args: --strict
3029

30+
build-macos:
31+
runs-on: macos-11
32+
33+
steps:
34+
- uses: actions/checkout@v2
35+
36+
- uses: maxim-lobanov/setup-xcode@v1
37+
with:
38+
xcode-version: latest-stable
39+
40+
- name: Run tests
41+
run: swift build -v -c release
42+
3143
test-macos:
32-
runs-on: macOS-latest
44+
runs-on: macos-11
3345

3446
steps:
3547
- uses: actions/checkout@v2
3648

49+
- uses: maxim-lobanov/setup-xcode@v1
50+
with:
51+
xcode-version: latest-stable
52+
3753
- name: Run tests
3854
run: swift test -v

‎.gitignore‎

Lines changed: 4 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,9 @@ Temporary Items
2626
.apdisk
2727

2828
# Xcode
29-
#
30-
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
31-
3229
## User settings
3330
xcuserdata/
3431

35-
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
36-
*.xcscmblueprint
37-
*.xccheckout
38-
39-
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
40-
build/
41-
DerivedData/
42-
*.moved-aside
43-
*.pbxuser
44-
!default.pbxuser
45-
*.mode1v3
46-
!default.mode1v3
47-
*.mode2v3
48-
!default.mode2v3
49-
*.perspectivev3
50-
!default.perspectivev3
51-
5232
## Obj-C/Swift specific
5333
*.hmap
5434

@@ -62,55 +42,9 @@ timeline.xctimeline
6242
playground.xcworkspace
6343

6444
# Swift Package Manager
65-
#
66-
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
67-
# Packages/
68-
# Package.pins
69-
# Package.resolved
70-
# *.xcodeproj
71-
#
72-
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
73-
# hence it is not needed unless you have added a package configuration file to your project
45+
Packages/
46+
Package.pins
47+
Package.resolved
48+
*.xcodeproj
7449
.swiftpm
7550
.build/
76-
77-
# CocoaPods
78-
#
79-
# We recommend against adding the Pods directory to your .gitignore. However
80-
# you should judge for yourself, the pros and cons are mentioned at:
81-
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
82-
#
83-
# Pods/
84-
#
85-
# Add this line if you want to avoid checking in source code from the Xcode workspace
86-
# *.xcworkspace
87-
88-
# Carthage
89-
#
90-
# Add this line if you want to avoid checking in source code from Carthage dependencies.
91-
# Carthage/Checkouts
92-
93-
Carthage/Build/
94-
95-
# Accio dependency management
96-
Dependencies/
97-
.accio/
98-
99-
# fastlane
100-
#
101-
# It is recommended to not store the screenshots in the git repo.
102-
# Instead, use fastlane to re-generate the screenshots whenever they are needed.
103-
# For more information about the recommended setup visit:
104-
# https://docs.fastlane.tools/best-practices/source-control/#source-control
105-
106-
fastlane/report.xml
107-
fastlane/Preview.html
108-
fastlane/screenshots/**/*.png
109-
fastlane/test_output
110-
111-
# Code Injection
112-
#
113-
# After new code Injection tools there's a generated folder /iOSInjectionProject
114-
# https://github.com/johnno1962/injectionforxcode
115-
116-
iOSInjectionProject/

‎Package.resolved‎

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

‎Package.swift‎

Lines changed: 47 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,51 @@
1-
// swift-tools-version:5.3
1+
// swift-tools-version:5.4
22
import PackageDescription
33

44
let package = Package(
5-
name: "BartyCrouch",
6-
platforms: [.macOS(.v10_15)],
7-
products: [
8-
.executable(name: "bartycrouch", targets: ["BartyCrouch"]),
9-
.library(name: "BartyCrouchKit", targets: ["BartyCrouchKit"]),
10-
.library(name: "BartyCrouchTranslator", targets: ["BartyCrouchTranslator"]),
11-
],
12-
dependencies: [
13-
.package(name: "HandySwift", url: "https://github.com/Flinesoft/HandySwift.git", from: "3.2.0"),
14-
.package(name: "Microya", url: "https://github.com/Flinesoft/Microya.git", .branch("main")),
15-
.package(name: "MungoHealer", url: "https://github.com/JamitLabs/MungoHealer.git", from: "0.3.2"),
16-
.package(name: "Rainbow", url: "https://github.com/onevcat/Rainbow.git", from: "3.1.5"),
17-
.package(name: "SwiftCLI", url: "https://github.com/jakeheis/SwiftCLI.git", from: "6.0.3"),
18-
.package(name: "Toml", url: "https://github.com/jdfergason/swift-toml.git", .branch("master")),
19-
.package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", from: "0.50500.0")
20-
],
21-
targets: [
22-
.target(
23-
name: "BartyCrouch",
24-
dependencies: ["BartyCrouchKit"],
25-
path: "Sources/BartyCrouch"
26-
),
27-
.target(
28-
name: "BartyCrouchKit",
29-
dependencies: [
30-
"BartyCrouchTranslator",
31-
"HandySwift",
32-
"MungoHealer",
33-
"Rainbow",
34-
"SwiftCLI",
35-
"SwiftSyntax",
36-
"Toml",
37-
],
38-
path: "Sources/BartyCrouchKit"
39-
),
40-
.testTarget(
41-
name: "BartyCrouchKitTests",
42-
dependencies: ["BartyCrouchKit", "Toml"],
43-
path: "Tests/BartyCrouchKitTests"
44-
),
45-
.target(
46-
name: "BartyCrouchTranslator",
47-
dependencies: ["HandySwift", "Microya", "MungoHealer"],
48-
path: "Sources/BartyCrouchTranslator"
49-
),
50-
.testTarget(
51-
name: "BartyCrouchTranslatorTests",
52-
dependencies: ["BartyCrouchTranslator"],
53-
path: "Tests/BartyCrouchTranslatorTests"
54-
)
55-
]
5+
name: "BartyCrouch",
6+
platforms: [.macOS(.v10_15)],
7+
products: [
8+
.executable(name: "bartycrouch", targets: ["BartyCrouch"]),
9+
.library(name: "BartyCrouchKit", targets: ["BartyCrouchKit"]),
10+
.library(name: "BartyCrouchTranslator", targets: ["BartyCrouchTranslator"]),
11+
],
12+
dependencies: [
13+
.package(name: "HandySwift", url: "https://github.com/Flinesoft/HandySwift.git", from: "3.2.0"),
14+
.package(name: "Microya", url: "https://github.com/Flinesoft/Microya.git", .branch("support/without-combine")),
15+
.package(name: "MungoHealer", url: "https://github.com/Flinesoft/MungoHealer.git", from: "0.3.4"),
16+
.package(name: "Rainbow", url: "https://github.com/onevcat/Rainbow.git", from: "3.1.5"),
17+
.package(name: "SwiftCLI", url: "https://github.com/jakeheis/SwiftCLI.git", from: "6.0.3"),
18+
.package(name: "Toml", url: "https://github.com/jdfergason/swift-toml.git", .branch("master")),
19+
.package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", from: "0.50500.0"),
20+
],
21+
targets: [
22+
.executableTarget(
23+
name: "BartyCrouch",
24+
dependencies: ["BartyCrouchKit"]
25+
),
26+
.target(
27+
name: "BartyCrouchKit",
28+
dependencies: [
29+
"BartyCrouchTranslator",
30+
"HandySwift",
31+
"MungoHealer",
32+
"Rainbow",
33+
"SwiftCLI",
34+
"SwiftSyntax",
35+
"Toml",
36+
]
37+
),
38+
.testTarget(
39+
name: "BartyCrouchKitTests",
40+
dependencies: ["BartyCrouchKit", "Toml"]
41+
),
42+
.target(
43+
name: "BartyCrouchTranslator",
44+
dependencies: ["HandySwift", "Microya", "MungoHealer"]
45+
),
46+
.testTarget(
47+
name: "BartyCrouchTranslatorTests",
48+
dependencies: ["BartyCrouchTranslator"]
49+
)
50+
]
5651
)

0 commit comments

Comments
 (0)