From b13c6ce29cd681831baa10497cef72f19c0812a8 Mon Sep 17 00:00:00 2001 From: Joshua Kaunert <44586402+jkaunert@users.noreply.github.com> Date: Fri, 26 May 2023 23:33:19 -0500 Subject: [PATCH 1/4] rename/resolve deps --- Package.resolved | 143 ++++++++++-------- Package.swift | 5 +- .../Filters/MarkdownFilter.swift | 2 +- Sources/MarkdownModule/MarkdownBuilder.swift | 2 +- Sources/MarkdownModule/MarkdownModule.swift | 2 +- 5 files changed, 82 insertions(+), 72 deletions(-) diff --git a/Package.resolved b/Package.resolved index d4720d7..cb87980 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/swift-server/async-http-client.git", "state": { "branch": null, - "revision": "7a4dfe026f6ee0f8ad741b58df74c60af296365d", - "version": "1.9.0" + "revision": "78db67e5bf4a8543075787f228e8920097319281", + "version": "1.18.0" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/vapor/async-kit.git", "state": { "branch": null, - "revision": "e2f741640364c1d271405da637029ea6a33f754e", - "version": "1.11.1" + "revision": "a61da00d404ec91d12766f1b9aac7d90777b484d", + "version": "1.17.0" } }, { @@ -24,35 +24,8 @@ "repositoryURL": "https://github.com/vapor/console-kit.git", "state": { "branch": null, - "revision": "75ea3b627d88221440b878e5dfccc73fd06842ed", - "version": "4.2.7" - } - }, - { - "package": "feather-core", - "repositoryURL": "https://github.com/feathercms/feather-core", - "state": { - "branch": "dev", - "revision": "a5df6b3986431e33663d294d0dee84814fccbd14", - "version": null - } - }, - { - "package": "feather-icons", - "repositoryURL": "https://github.com/feathercms/feather-icons", - "state": { - "branch": "main", - "revision": "2d1e6715ad6f6a810434f1306d5d94691d1338d7", - "version": null - } - }, - { - "package": "feather-objects", - "repositoryURL": "https://github.com/feathercms/feather-objects", - "state": { - "branch": "main", - "revision": "169386ce3bf664fa768186467e4aec1caaee0fcf", - "version": null + "revision": "447f1046fb4e9df40973fe426ecb24a6f0e8d3b4", + "version": "4.6.0" } }, { @@ -60,8 +33,8 @@ "repositoryURL": "https://github.com/vapor/fluent", "state": { "branch": null, - "revision": "ea707ee318066a073c95b2b2df1aa640fcb67f9e", - "version": "4.4.0" + "revision": "4b4d8bf15a06fd60137e9c543e5503c4b842654e", + "version": "4.8.0" } }, { @@ -69,8 +42,8 @@ "repositoryURL": "https://github.com/vapor/fluent-kit.git", "state": { "branch": null, - "revision": "53a7276e577d0dd192dc551c3d0908dcc85af88f", - "version": "1.23.1" + "revision": "e53acf986e32c54fe522b2c12f737baa01828c1c", + "version": "1.42.2" } }, { @@ -123,8 +96,8 @@ "repositoryURL": "https://github.com/vapor/multipart-kit.git", "state": { "branch": null, - "revision": "2dd9368a3c9580792b77c7ef364f3735909d9996", - "version": "4.5.1" + "revision": "1adfd69df2da08f7931d4281b257475e32c96734", + "version": "4.5.4" } }, { @@ -132,8 +105,8 @@ "repositoryURL": "https://github.com/vapor/routing-kit.git", "state": { "branch": null, - "revision": "5603b81ceb744b8318feab1e60943704977a866b", - "version": "4.3.1" + "revision": "611bc45c5dfb1f54b84d99b89d1f72191fb6b71b", + "version": "4.7.2" } }, { @@ -141,8 +114,26 @@ "repositoryURL": "https://github.com/vapor/sql-kit.git", "state": { "branch": null, - "revision": "9cc30f8cef132e91a07e36005612b37f918731fc", - "version": "3.16.0" + "revision": "5026e7c0f2e464ea1af9f5948701aa8922ab14eb", + "version": "3.27.0" + } + }, + { + "package": "swift-algorithms", + "repositoryURL": "https://github.com/apple/swift-algorithms.git", + "state": { + "branch": null, + "revision": "b14b7f4c528c942f121c8b860b9410b2bf57825e", + "version": "1.0.0" + } + }, + { + "package": "swift-atomics", + "repositoryURL": "https://github.com/apple/swift-atomics.git", + "state": { + "branch": null, + "revision": "6c89474e62719ddcc1e9614989fff2f68208fe10", + "version": "1.1.0" } }, { @@ -150,8 +141,17 @@ "repositoryURL": "https://github.com/swift-server/swift-backtrace.git", "state": { "branch": null, - "revision": "d3e04a9d4b3833363fb6192065b763310b156d54", - "version": "1.3.1" + "revision": "f25620d5d05e2f1ba27154b40cafea2b67566956", + "version": "1.3.3" + } + }, + { + "package": "swift-collections", + "repositoryURL": "https://github.com/apple/swift-collections.git", + "state": { + "branch": null, + "revision": "937e904258d22af6e447a0b72c0bc67583ef64a2", + "version": "1.0.4" } }, { @@ -159,8 +159,8 @@ "repositoryURL": "https://github.com/apple/swift-crypto.git", "state": { "branch": null, - "revision": "a8911e0fadc25aef1071d582355bd1037a176060", - "version": "2.0.4" + "revision": "33a20e650c33f6d72d822d558333f2085effa3dc", + "version": "2.5.0" } }, { @@ -168,8 +168,8 @@ "repositoryURL": "https://github.com/binarybirds/swift-html", "state": { "branch": null, - "revision": "e07678a77d296e66fa891a9d4d08acc4471d1783", - "version": "1.6.11" + "revision": "f4fa5bc83fbee8dbd301c6fbb3969437415adad0", + "version": "1.7.0" } }, { @@ -177,8 +177,8 @@ "repositoryURL": "https://github.com/apple/swift-log.git", "state": { "branch": null, - "revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7", - "version": "1.4.2" + "revision": "32e8d724467f8fe623624570367e3d50c5638e46", + "version": "1.5.2" } }, { @@ -186,8 +186,8 @@ "repositoryURL": "https://github.com/apple/swift-metrics.git", "state": { "branch": null, - "revision": "eadb828f878fed144387e3845866225bb7082c56", - "version": "2.3.0" + "revision": "e8bced74bc6d747745935e469f45d03f048d6cbd", + "version": "2.3.4" } }, { @@ -195,8 +195,8 @@ "repositoryURL": "https://github.com/apple/swift-nio.git", "state": { "branch": null, - "revision": "154f1d32366449dcccf6375a173adf4ed2a74429", - "version": "2.38.0" + "revision": "2d8e6ca36fe3e8ed74b0883f593757a45463c34d", + "version": "2.53.0" } }, { @@ -204,8 +204,8 @@ "repositoryURL": "https://github.com/apple/swift-nio-extras.git", "state": { "branch": null, - "revision": "f73ca5ee9c6806800243f1ac415fcf82de9a4c91", - "version": "1.10.2" + "revision": "0e0d0aab665ff1a0659ce75ac003081f2b1c8997", + "version": "1.19.0" } }, { @@ -213,8 +213,8 @@ "repositoryURL": "https://github.com/apple/swift-nio-http2.git", "state": { "branch": null, - "revision": "ac2a5afce3dbb6795b4f78ec3f19726dc28f5617", - "version": "1.20.0" + "revision": "6d021a48483dbb273a9be43f65234bdc9185b364", + "version": "1.26.0" } }, { @@ -222,8 +222,8 @@ "repositoryURL": "https://github.com/apple/swift-nio-ssl.git", "state": { "branch": null, - "revision": "52a486ff6de9bc3e26bf634c5413c41c5fa89ca5", - "version": "2.17.2" + "revision": "e866a626e105042a6a72a870c88b4c531ba05f83", + "version": "2.24.0" } }, { @@ -231,8 +231,17 @@ "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git", "state": { "branch": null, - "revision": "8ab824b140d0ebcd87e9149266ddc353e3705a3e", - "version": "1.11.4" + "revision": "41f4098903878418537020075a4d8a6e20a0b182", + "version": "1.17.0" + } + }, + { + "package": "swift-numerics", + "repositoryURL": "https://github.com/apple/swift-numerics", + "state": { + "branch": null, + "revision": "0a5bc04095a675662cf24757cc0640aa2204253b", + "version": "1.0.2" } }, { @@ -240,8 +249,8 @@ "repositoryURL": "https://github.com/vapor/vapor", "state": { "branch": null, - "revision": "5861bf9e2cff2c4cb0dcfb0c15ecfaa8bc5630e0", - "version": "4.55.3" + "revision": "8b79ff0bd264a33bd0b7471dcf50dd1be983f992", + "version": "4.76.3" } }, { @@ -249,8 +258,8 @@ "repositoryURL": "https://github.com/vapor/websocket-kit.git", "state": { "branch": null, - "revision": "ff8fbce837ef01a93d49c6fb49a72be0f150dac7", - "version": "2.3.0" + "revision": "2ec14506d5f8199926906dc5a620ac22b147db86", + "version": "2.13.0" } } ] diff --git a/Package.swift b/Package.swift index 2b9982b..85b72c2 100644 --- a/Package.swift +++ b/Package.swift @@ -10,12 +10,13 @@ let package = Package( .library(name: "MarkdownModule", targets: ["MarkdownModule"]), ], dependencies: [ - .package(url: "https://github.com/feathercms/feather-core", .branch("dev")), + .package(path: "../feather-core"), +// .package(url: "https://github.com/feathercms/feather-core", .branch("dev")), .package(url: "https://github.com/JohnSundell/Ink", from: "0.5.0"), ], targets: [ .target(name: "MarkdownModule", dependencies: [ - .product(name: "Feather", package: "feather-core"), + .product(name: "FeatherCore", package: "feather-core"), .product(name: "Ink", package: "Ink"), ], resources: [ diff --git a/Sources/MarkdownModule/Filters/MarkdownFilter.swift b/Sources/MarkdownModule/Filters/MarkdownFilter.swift index 39c1d62..0d61a63 100644 --- a/Sources/MarkdownModule/Filters/MarkdownFilter.swift +++ b/Sources/MarkdownModule/Filters/MarkdownFilter.swift @@ -5,7 +5,7 @@ // Created by Tibor Bodecs on 2021. 12. 21.. // -import Feather +import FeatherCore import Vapor import Ink diff --git a/Sources/MarkdownModule/MarkdownBuilder.swift b/Sources/MarkdownModule/MarkdownBuilder.swift index c21b281..7196cb7 100644 --- a/Sources/MarkdownModule/MarkdownBuilder.swift +++ b/Sources/MarkdownModule/MarkdownBuilder.swift @@ -5,7 +5,7 @@ // Created by Tibor Bodecs on 2021. 12. 27.. // -import Feather +import FeatherCore @_cdecl("createMarkdownModule") public func createMarkdownModule() -> UnsafeMutableRawPointer { diff --git a/Sources/MarkdownModule/MarkdownModule.swift b/Sources/MarkdownModule/MarkdownModule.swift index 841e577..07a59f5 100644 --- a/Sources/MarkdownModule/MarkdownModule.swift +++ b/Sources/MarkdownModule/MarkdownModule.swift @@ -5,7 +5,7 @@ // Created by Tibor Bodecs on 2021. 12. 21.. // -import Feather +import FeatherCore import Vapor struct MarkdownModule: FeatherModule { From 1c297ccb6d190ef559e9a357a0d3a03058fab5ea Mon Sep 17 00:00:00 2001 From: Joshua Kaunert <44586402+jkaunert@users.noreply.github.com> Date: Sat, 27 May 2023 18:29:17 -0500 Subject: [PATCH 2/4] re-enables remote SP --- Package.resolved | 18 ++++++++++++++++++ Package.swift | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Package.resolved b/Package.resolved index cb87980..c411dfb 100644 --- a/Package.resolved +++ b/Package.resolved @@ -28,6 +28,24 @@ "version": "4.6.0" } }, + { + "package": "feather-icons", + "repositoryURL": "https://github.com/feathercms/feather-icons", + "state": { + "branch": "main", + "revision": "2d1e6715ad6f6a810434f1306d5d94691d1338d7", + "version": null + } + }, + { + "package": "feather-objects", + "repositoryURL": "https://github.com/Rando-Coderissian/feather-objects", + "state": { + "branch": "test-refactor-modules", + "revision": "169386ce3bf664fa768186467e4aec1caaee0fcf", + "version": null + } + }, { "package": "fluent", "repositoryURL": "https://github.com/vapor/fluent", diff --git a/Package.swift b/Package.swift index 85b72c2..51e2067 100644 --- a/Package.swift +++ b/Package.swift @@ -10,7 +10,9 @@ let package = Package( .library(name: "MarkdownModule", targets: ["MarkdownModule"]), ], dependencies: [ - .package(path: "../feather-core"), +// .package(path: "../feather-core"), + .package(url: "https://github.com/feathercms/feather-core", .branch("test-refactored-modules")), + // .package(url: "https://github.com/feathercms/feather-core", .branch("dev")), .package(url: "https://github.com/JohnSundell/Ink", from: "0.5.0"), ], From c7ceeef5f5a36ba4d82b5c0788ba1fa94ce51aca Mon Sep 17 00:00:00 2001 From: Joshua Kaunert <44586402+jkaunert@users.noreply.github.com> Date: Sat, 27 May 2023 18:57:50 -0500 Subject: [PATCH 3/4] re-enables remote SP --- Package.resolved | 9 +++++++++ Package.swift | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Package.resolved b/Package.resolved index c411dfb..99d0d9e 100644 --- a/Package.resolved +++ b/Package.resolved @@ -28,6 +28,15 @@ "version": "4.6.0" } }, + { + "package": "feather-core", + "repositoryURL": "https://github.com/Rando-Coderissian/feather-core", + "state": { + "branch": "test-refactored-modules", + "revision": "7a352c919180a9c6f05bc05f1ba86936d8d11e56", + "version": null + } + }, { "package": "feather-icons", "repositoryURL": "https://github.com/feathercms/feather-icons", diff --git a/Package.swift b/Package.swift index 51e2067..9a9df29 100644 --- a/Package.swift +++ b/Package.swift @@ -11,7 +11,7 @@ let package = Package( ], dependencies: [ // .package(path: "../feather-core"), - .package(url: "https://github.com/feathercms/feather-core", .branch("test-refactored-modules")), + .package(url: "https://github.com/Rando-Coderissian/feather-core", .branch("test-refactored-modules")), // .package(url: "https://github.com/feathercms/feather-core", .branch("dev")), .package(url: "https://github.com/JohnSundell/Ink", from: "0.5.0"), From c1d5bd61a5924beb35d4dd32f1f8aa37b5bb2e01 Mon Sep 17 00:00:00 2001 From: Joshua Kaunert <44586402+jkaunert@users.noreply.github.com> Date: Mon, 29 May 2023 08:18:22 -0500 Subject: [PATCH 4/4] refactor dep urls for merge --- Package.swift | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index 9a9df29..52abfcb 100644 --- a/Package.swift +++ b/Package.swift @@ -10,10 +10,7 @@ let package = Package( .library(name: "MarkdownModule", targets: ["MarkdownModule"]), ], dependencies: [ -// .package(path: "../feather-core"), - .package(url: "https://github.com/Rando-Coderissian/feather-core", .branch("test-refactored-modules")), - -// .package(url: "https://github.com/feathercms/feather-core", .branch("dev")), + .package(url: "https://github.com/feathercms/feather-core", .branch("dev")), .package(url: "https://github.com/JohnSundell/Ink", from: "0.5.0"), ], targets: [