Merge pull request ra1028#92 from ra1028/v1.1.5

V1.1.5

.github/workflows/ci.yml

@@ -15,6 +15,9 @@ jobs:
       - name: Show environments
         run: |
           swift --version
+      - name: Validate mod
+        if: matrix.swift_version == '5.1'
+        run: make mod-check
       - name: Swift test
         run: |
           swift build

.swift-mod.yml

@@ -0,0 +1,16 @@
+format:
+  indent: 4
+  lineBreakBeforeEachArgument: true
+targets:
+  main:
+    paths:
+      - Sources
+    rules:
+      defaultAccessLevel:
+        accessLevel: openOrPublic
+        implicitInternal: true
+
+      defaultMemberwiseInitializer:
+        implicitInitializer: true
+        implicitInternal: true
+        ignoreClassesWithInheritance: false

DifferenceKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name = 'DifferenceKit'
-  spec.version  = '1.1.4'
+  spec.version  = '1.1.5'
   spec.author = { 'ra1028' => '[email protected]' }
   spec.homepage = 'https://github.com/ra1028/DifferenceKit'
   spec.documentation_url = 'https://ra1028.github.io/DifferenceKit'

Makefile

@@ -1,5 +1,6 @@
 gems-install:
-	bundle install --path vendor/bundle
+	bundle config path vendor/bundle
+	bundle install --jobs 4 --retry 3
 
 docs-gen:
 	bundle exec jazzy --config .jazzy.yaml
@@ -8,10 +9,16 @@ lib-lint:
 	bundle exec pod lib lint
 
 pod-release:
-	bundle exec pod trunk push --allow-warnings
+	bundle exec pod trunk push DifferenceKit.podspec
 
 test-linux:
-	sh test-linux.sh
+	docker run -v `pwd`:`pwd` -w `pwd` --rm swift:latest swift test
+
+mod:
+	swift run -c release --package-path ./Packages swift-mod
+
+mod-check:
+	swift run -c release --package-path ./Packages swift-mod --check
 
 generate-linuxmain:
 	swift test --generate-linuxmain

Packages/Package.resolved

@@ -0,0 +1,43 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "swift-mod",
+        "repositoryURL": "https://github.com/ra1028/swift-mod.git",
+        "state": {
+          "branch": null,
+          "revision": "85deacdd78b6078e9cb252c58be35658e002a120",
+          "version": "0.0.1"
+        }
+      },
+      {
+        "package": "SwiftSyntax",
+        "repositoryURL": "https://github.com/apple/swift-syntax",
+        "state": {
+          "branch": null,
+          "revision": "3e3eb191fcdbecc6031522660c4ed6ce25282c25",
+          "version": "0.50100.0"
+        }
+      },
+      {
+        "package": "swift-tools-support-core",
+        "repositoryURL": "https://github.com/apple/swift-tools-support-core.git",
+        "state": {
+          "branch": null,
+          "revision": "693aba4c4c9dcc4767cc853a0dd38bf90ad8c258",
+          "version": "0.0.1"
+        }
+      },
+      {
+        "package": "Yams",
+        "repositoryURL": "https://github.com/jpsim/Yams.git",
+        "state": {
+          "branch": null,
+          "revision": "c947a306d2e80ecb2c0859047b35c73b8e1ca27f",
+          "version": "2.0.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}

Packages/Package.swift

@@ -0,0 +1,10 @@
+// swift-tools-version:5.1
+
+import PackageDescription
+
+let package = Package(
+    name: "Modules",
+    dependencies: [
+        .package(url: "https://github.com/ra1028/swift-mod.git", .exact("0.0.1"))
+    ]
+)