From a9f443d06a1f1d953a49b5bfa48963112f69d03c Mon Sep 17 00:00:00 2001 From: yutailang0119 Date: Tue, 8 Feb 2022 15:48:08 +0900 Subject: [PATCH 1/9] Bump swift-tools-veersion from 5.0 to 5.5 --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 48007b2..e83d43c 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.0 +// swift-tools-version:5.5 import PackageDescription let package = Package( From bd2c854b31c41139049e58bbdc46b93af6f8d601 Mon Sep 17 00:00:00 2001 From: yutailang0119 Date: Tue, 8 Feb 2022 15:53:20 +0900 Subject: [PATCH 2/9] Fix format of Package.swift for swift-tools-version 5.5 --- Package.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index e83d43c..2d15253 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,11 @@ let package = Package( ], targets: [ .target(name: "DIKit"), - .target(name: "DIGenKit", dependencies: ["DIKit", "SourceKittenFramework"]), + .target(name: "DIGenKit", + dependencies: [ + "DIKit", + .product(name: "SourceKittenFramework", package: "SourceKitten"), + ]), .target(name: "dikitgen", dependencies: ["DIGenKit"]), .testTarget(name: "DIGenKitTests", dependencies: ["DIGenKit"]) ], From de6f99023d62ee1b89192cc508aca103c60cf020 Mon Sep 17 00:00:00 2001 From: yutailang0119 Date: Tue, 8 Feb 2022 15:54:55 +0900 Subject: [PATCH 3/9] Bump SourceKitten from 0.23.0 to 0.31.0 in Carthage --- Cartfile.private | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cartfile.private b/Cartfile.private index 07f456f..92d3908 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1 +1 @@ -github "jpsim/SourceKitten" ~> 0.23.0 +github "jpsim/SourceKitten" ~> 0.31.1 From b995f513d888cd315b5c977912bcc26a98e8e2cb Mon Sep 17 00:00:00 2001 From: yutailang0119 Date: Tue, 8 Feb 2022 15:55:10 +0900 Subject: [PATCH 4/9] carthage update --- Cartfile.resolved | 4 +--- Carthage/Checkouts/SourceKitten | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index 527a732..13424f9 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1 @@ -github "drmohundro/SWXMLHash" "4.8.0" -github "jpsim/SourceKitten" "0.23.0" -github "jpsim/Yams" "2.0.0" +github "jpsim/SourceKitten" "0.31.1" diff --git a/Carthage/Checkouts/SourceKitten b/Carthage/Checkouts/SourceKitten index 421a1ec..5586283 160000 --- a/Carthage/Checkouts/SourceKitten +++ b/Carthage/Checkouts/SourceKitten @@ -1 +1 @@ -Subproject commit 421a1ec6112b83265b63a163107c9b638dc56e86 +Subproject commit 558628392eb31d37cb251cfe626c53eafd330df6 From 5e4ba4c5423f12cc9df50a7b24fc44517305490f Mon Sep 17 00:00:00 2001 From: yutailang0119 Date: Tue, 8 Feb 2022 15:56:51 +0900 Subject: [PATCH 5/9] Bump SourceKitten from 0.23.0 to 0.31.1 in SwiftPM --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 2d15253..27e1b23 100644 --- a/Package.swift +++ b/Package.swift @@ -12,7 +12,7 @@ let package = Package( .library(name: "DIGenKit", targets: ["DIGenKit"]) ], dependencies: [ - .package(url: "https://github.com/jpsim/SourceKitten.git", from: "0.23.0") + .package(url: "https://github.com/jpsim/SourceKitten.git", from: "0.31.1"), ], targets: [ .target(name: "DIKit"), From 711ee49e9b920ef74d5b2e889890f70d2526b1b7 Mon Sep 17 00:00:00 2001 From: yutailang0119 Date: Tue, 8 Feb 2022 15:57:08 +0900 Subject: [PATCH 6/9] swift package update --- Package.resolved | 42 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/Package.resolved b/Package.resolved index 244e84c..632fbc1 100644 --- a/Package.resolved +++ b/Package.resolved @@ -2,39 +2,21 @@ "object": { "pins": [ { - "package": "Commandant", - "repositoryURL": "https://github.com/Carthage/Commandant.git", - "state": { - "branch": null, - "revision": "ab68611013dec67413628ac87c1f29e8427bc8e4", - "version": "0.17.0" - } - }, - { - "package": "Nimble", - "repositoryURL": "https://github.com/Quick/Nimble.git", - "state": { - "branch": null, - "revision": "43304bf2b1579fd555f2fdd51742771c1e4f2b98", - "version": "8.0.1" - } - }, - { - "package": "Quick", - "repositoryURL": "https://github.com/Quick/Quick.git", + "package": "SourceKitten", + "repositoryURL": "https://github.com/jpsim/SourceKitten.git", "state": { "branch": null, - "revision": "0b4ed6c706dd0cce923b5019a605a9bcc6b1b600", - "version": "2.0.0" + "revision": "558628392eb31d37cb251cfe626c53eafd330df6", + "version": "0.31.1" } }, { - "package": "SourceKitten", - "repositoryURL": "https://github.com/jpsim/SourceKitten.git", + "package": "swift-argument-parser", + "repositoryURL": "https://github.com/apple/swift-argument-parser.git", "state": { "branch": null, - "revision": "421a1ec6112b83265b63a163107c9b638dc56e86", - "version": "0.23.0" + "revision": "e394bf350e38cb100b6bc4172834770ede1b7232", + "version": "1.0.3" } }, { @@ -42,8 +24,8 @@ "repositoryURL": "https://github.com/drmohundro/SWXMLHash.git", "state": { "branch": null, - "revision": "0d6bb315528888edde0dafe93564f074669c44e9", - "version": "4.8.0" + "revision": "9183170d20857753d4f331b0ca63f73c60764bf3", + "version": "5.0.2" } }, { @@ -51,8 +33,8 @@ "repositoryURL": "https://github.com/jpsim/Yams.git", "state": { "branch": null, - "revision": "c947a306d2e80ecb2c0859047b35c73b8e1ca27f", - "version": "2.0.0" + "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", + "version": "4.0.6" } } ] From 377ecaef6d537284d01d810825449332aa360376 Mon Sep 17 00:00:00 2001 From: yutailang0119 Date: Tue, 8 Feb 2022 15:58:39 +0900 Subject: [PATCH 7/9] Fix for updated SourceKitten --- Sources/DIGenKit/Structure/Import.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/DIGenKit/Structure/Import.swift b/Sources/DIGenKit/Structure/Import.swift index 4a33c5e..3b94280 100644 --- a/Sources/DIGenKit/Structure/Import.swift +++ b/Sources/DIGenKit/Structure/Import.swift @@ -20,8 +20,8 @@ struct Import { } let view = file.contents.utf8 - let startIndex = view.index(view.startIndex, offsetBy: Int(token.offset)) - let endIndex = view.index(startIndex, offsetBy: Int(token.length)) + let startIndex = view.index(view.startIndex, offsetBy: Int(token.offset.value)) + let endIndex = view.index(startIndex, offsetBy: Int(token.length.value)) let value = String(view[startIndex.. Date: Tue, 8 Feb 2022 16:04:35 +0900 Subject: [PATCH 8/9] Fix to use executableTarget for dikitgen --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 27e1b23..853941a 100644 --- a/Package.swift +++ b/Package.swift @@ -21,7 +21,7 @@ let package = Package( "DIKit", .product(name: "SourceKittenFramework", package: "SourceKitten"), ]), - .target(name: "dikitgen", dependencies: ["DIGenKit"]), + .executableTarget(name: "dikitgen", dependencies: ["DIGenKit"]), .testTarget(name: "DIGenKitTests", dependencies: ["DIGenKit"]) ], swiftLanguageVersions: [.v5] From 8ef8029e221922962101f43bd748fe866189a404 Mon Sep 17 00:00:00 2001 From: yutailang0119 Date: Tue, 8 Feb 2022 16:05:16 +0900 Subject: [PATCH 9/9] Fix deprecated 'class' keyword --- Sources/DIKit/Injectable.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/DIKit/Injectable.swift b/Sources/DIKit/Injectable.swift index be6ad9e..63d980b 100644 --- a/Sources/DIKit/Injectable.swift +++ b/Sources/DIKit/Injectable.swift @@ -15,7 +15,7 @@ public protocol FactoryMethodInjectable { static func makeInstance(dependency: Dependency) -> Self } -public protocol PropertyInjectable: class { +public protocol PropertyInjectable: AnyObject { associatedtype Dependency var dependency: Dependency! { get set } }