Skip to content

Commit 14c6668

Browse files
authored
Merge pull request #92 from ra1028/v1.1.5
V1.1.5
2 parents a285b0f + e0debda commit 14c6668

File tree

6 files changed

+83
-4
lines changed

6 files changed

+83
-4
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ jobs:
1515
- name: Show environments
1616
run: |
1717
swift --version
18+
- name: Validate mod
19+
if: matrix.swift_version == '5.1'
20+
run: make mod-check
1821
- name: Swift test
1922
run: |
2023
swift build

.swift-mod.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
format:
2+
indent: 4
3+
lineBreakBeforeEachArgument: true
4+
targets:
5+
main:
6+
paths:
7+
- Sources
8+
rules:
9+
defaultAccessLevel:
10+
accessLevel: openOrPublic
11+
implicitInternal: true
12+
13+
defaultMemberwiseInitializer:
14+
implicitInitializer: true
15+
implicitInternal: true
16+
ignoreClassesWithInheritance: false

DifferenceKit.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |spec|
22
spec.name = 'DifferenceKit'
3-
spec.version = '1.1.4'
3+
spec.version = '1.1.5'
44
spec.author = { 'ra1028' => '[email protected]' }
55
spec.homepage = 'https://github.com/ra1028/DifferenceKit'
66
spec.documentation_url = 'https://ra1028.github.io/DifferenceKit'

Makefile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
gems-install:
2-
bundle install --path vendor/bundle
2+
bundle config path vendor/bundle
3+
bundle install --jobs 4 --retry 3
34

45
docs-gen:
56
bundle exec jazzy --config .jazzy.yaml
@@ -8,10 +9,16 @@ lib-lint:
89
bundle exec pod lib lint
910

1011
pod-release:
11-
bundle exec pod trunk push --allow-warnings
12+
bundle exec pod trunk push DifferenceKit.podspec
1213

1314
test-linux:
14-
sh test-linux.sh
15+
docker run -v `pwd`:`pwd` -w `pwd` --rm swift:latest swift test
16+
17+
mod:
18+
swift run -c release --package-path ./Packages swift-mod
19+
20+
mod-check:
21+
swift run -c release --package-path ./Packages swift-mod --check
1522

1623
generate-linuxmain:
1724
swift test --generate-linuxmain

Packages/Package.resolved

Lines changed: 43 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/Package.swift

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// swift-tools-version:5.1
2+
3+
import PackageDescription
4+
5+
let package = Package(
6+
name: "Modules",
7+
dependencies: [
8+
.package(url: "https://github.com/ra1028/swift-mod.git", .exact("0.0.1"))
9+
]
10+
)

0 commit comments

Comments
 (0)