From 8648ede6f2962157a7067ef42f341bf6fd395463 Mon Sep 17 00:00:00 2001 From: Joshua Kaunert <44586402+jkaunert@users.noreply.github.com> Date: Sat, 27 May 2023 17:25:06 -0500 Subject: [PATCH 1/4] rename/resolve deps --- Package.resolved | 277 ----------------------------------------------- Package.swift | 6 +- 2 files changed, 3 insertions(+), 280 deletions(-) delete mode 100644 Package.resolved diff --git a/Package.resolved b/Package.resolved deleted file mode 100644 index b3a0da4..0000000 --- a/Package.resolved +++ /dev/null @@ -1,277 +0,0 @@ -{ - "object": { - "pins": [ - { - "package": "ALanguageParser", - "repositoryURL": "https://github.com/matsoftware/accept-language-parser", - "state": { - "branch": null, - "revision": "0a6d89e0159b2f926b35a9f6ee28b6f9c1e84a1b", - "version": "1.0.0" - } - }, - { - "package": "analytics-objects", - "repositoryURL": "https://github.com/feathercms/analytics-objects", - "state": { - "branch": "main", - "revision": "088a22545364d506ddf3af27764a6ee1d0cd9f8e", - "version": null - } - }, - { - "package": "async-http-client", - "repositoryURL": "https://github.com/swift-server/async-http-client.git", - "state": { - "branch": null, - "revision": "7a4dfe026f6ee0f8ad741b58df74c60af296365d", - "version": "1.9.0" - } - }, - { - "package": "async-kit", - "repositoryURL": "https://github.com/vapor/async-kit.git", - "state": { - "branch": null, - "revision": "e2f741640364c1d271405da637029ea6a33f754e", - "version": "1.11.1" - } - }, - { - "package": "console-kit", - "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 - } - }, - { - "package": "fluent", - "repositoryURL": "https://github.com/vapor/fluent", - "state": { - "branch": null, - "revision": "ea707ee318066a073c95b2b2df1aa640fcb67f9e", - "version": "4.4.0" - } - }, - { - "package": "fluent-kit", - "repositoryURL": "https://github.com/vapor/fluent-kit.git", - "state": { - "branch": null, - "revision": "53a7276e577d0dd192dc551c3d0908dcc85af88f", - "version": "1.23.1" - } - }, - { - "package": "liquid", - "repositoryURL": "https://github.com/binarybirds/liquid", - "state": { - "branch": null, - "revision": "865eca0fd64273fd4352c26db6f0019d254102cb", - "version": "1.3.2" - } - }, - { - "package": "liquid-kit", - "repositoryURL": "https://github.com/binarybirds/liquid-kit.git", - "state": { - "branch": null, - "revision": "d2532e66faad5df4c63d85c7a2fdecc25a679916", - "version": "1.3.4" - } - }, - { - "package": "mail", - "repositoryURL": "https://github.com/binarybirds/mail", - "state": { - "branch": null, - "revision": "f1dc8be5ea3b80952fb000b32d69609961b0b3bf", - "version": "0.0.2" - } - }, - { - "package": "mail-kit", - "repositoryURL": "https://github.com/binarybirds/mail-kit.git", - "state": { - "branch": null, - "revision": "3432472362c20e1537da8047c134f223b59dadd2", - "version": "0.0.1" - } - }, - { - "package": "multipart-kit", - "repositoryURL": "https://github.com/vapor/multipart-kit.git", - "state": { - "branch": null, - "revision": "2dd9368a3c9580792b77c7ef364f3735909d9996", - "version": "4.5.1" - } - }, - { - "package": "routing-kit", - "repositoryURL": "https://github.com/vapor/routing-kit.git", - "state": { - "branch": null, - "revision": "5603b81ceb744b8318feab1e60943704977a866b", - "version": "4.3.1" - } - }, - { - "package": "sql-kit", - "repositoryURL": "https://github.com/vapor/sql-kit.git", - "state": { - "branch": null, - "revision": "9cc30f8cef132e91a07e36005612b37f918731fc", - "version": "3.16.0" - } - }, - { - "package": "swift-backtrace", - "repositoryURL": "https://github.com/swift-server/swift-backtrace.git", - "state": { - "branch": null, - "revision": "d3e04a9d4b3833363fb6192065b763310b156d54", - "version": "1.3.1" - } - }, - { - "package": "swift-crypto", - "repositoryURL": "https://github.com/apple/swift-crypto.git", - "state": { - "branch": null, - "revision": "a8911e0fadc25aef1071d582355bd1037a176060", - "version": "2.0.4" - } - }, - { - "package": "swift-html", - "repositoryURL": "https://github.com/binarybirds/swift-html", - "state": { - "branch": null, - "revision": "e07678a77d296e66fa891a9d4d08acc4471d1783", - "version": "1.6.11" - } - }, - { - "package": "swift-log", - "repositoryURL": "https://github.com/apple/swift-log.git", - "state": { - "branch": null, - "revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7", - "version": "1.4.2" - } - }, - { - "package": "swift-metrics", - "repositoryURL": "https://github.com/apple/swift-metrics.git", - "state": { - "branch": null, - "revision": "eadb828f878fed144387e3845866225bb7082c56", - "version": "2.3.0" - } - }, - { - "package": "swift-nio", - "repositoryURL": "https://github.com/apple/swift-nio.git", - "state": { - "branch": null, - "revision": "154f1d32366449dcccf6375a173adf4ed2a74429", - "version": "2.38.0" - } - }, - { - "package": "swift-nio-extras", - "repositoryURL": "https://github.com/apple/swift-nio-extras.git", - "state": { - "branch": null, - "revision": "f73ca5ee9c6806800243f1ac415fcf82de9a4c91", - "version": "1.10.2" - } - }, - { - "package": "swift-nio-http2", - "repositoryURL": "https://github.com/apple/swift-nio-http2.git", - "state": { - "branch": null, - "revision": "ac2a5afce3dbb6795b4f78ec3f19726dc28f5617", - "version": "1.20.0" - } - }, - { - "package": "swift-nio-ssl", - "repositoryURL": "https://github.com/apple/swift-nio-ssl.git", - "state": { - "branch": null, - "revision": "52a486ff6de9bc3e26bf634c5413c41c5fa89ca5", - "version": "2.17.2" - } - }, - { - "package": "swift-nio-transport-services", - "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git", - "state": { - "branch": null, - "revision": "8ab824b140d0ebcd87e9149266ddc353e3705a3e", - "version": "1.11.4" - } - }, - { - "package": "UAParserSwift", - "repositoryURL": "https://github.com/malcommac/UAParserSwift", - "state": { - "branch": null, - "revision": "a8057c7cff60db2cdf31d0a0a68ce430754ab64e", - "version": "1.2.1" - } - }, - { - "package": "vapor", - "repositoryURL": "https://github.com/vapor/vapor", - "state": { - "branch": null, - "revision": "5861bf9e2cff2c4cb0dcfb0c15ecfaa8bc5630e0", - "version": "4.55.3" - } - }, - { - "package": "websocket-kit", - "repositoryURL": "https://github.com/vapor/websocket-kit.git", - "state": { - "branch": null, - "revision": "ff8fbce837ef01a93d49c6fb49a72be0f150dac7", - "version": "2.3.0" - } - } - ] - }, - "version": 1 -} diff --git a/Package.swift b/Package.swift index 28049fa..b86f38d 100644 --- a/Package.swift +++ b/Package.swift @@ -10,15 +10,15 @@ let package = Package( .library(name: "AnalyticsModule", targets: ["AnalyticsModule"]), ], dependencies: [ - .package(url: "https://github.com/feathercms/feather-core", .branch("dev")), - .package(url: "https://github.com/feathercms/analytics-objects", .branch("main")), + .package(url: "https://github.com/Rando-Coderissian/feather-core", .branch("test-refactored-modules")), + .package(url: "https://github.com/Rando-Coderissian/analytics-objects", .branch("test-refactor-modules")), .package(url: "https://github.com/malcommac/UAParserSwift", from: "1.2.1"), .package(name: "ALanguageParser", url: "https://github.com/matsoftware/accept-language-parser", from: "1.0.0"), .package(url: "https://github.com/vapor/sql-kit.git", from: "3.0.0"), ], targets: [ .target(name: "AnalyticsModule", dependencies: [ - .product(name: "Feather", package: "feather-core"), + .product(name: "FeatherCore", package: "feather-core"), .product(name: "AnalyticsObjects", package: "analytics-objects"), .product(name: "UAParserSwift", package: "UAParserSwift"), .product(name: "ALanguageParser", package: "ALanguageParser"), From c4d513395713e0901a4827d788a1156bfca3cb90 Mon Sep 17 00:00:00 2001 From: Joshua Kaunert <44586402+jkaunert@users.noreply.github.com> Date: Sat, 27 May 2023 17:30:19 -0500 Subject: [PATCH 2/4] updates imports --- Package.resolved | 277 ++++++++++++++++++ Package.swift | 6 +- .../AnalyticsModule/AnalyticsBuilder.swift | 2 +- Sources/AnalyticsModule/AnalyticsModule.swift | 2 +- .../Admin/AnalyticsAdminController.swift | 2 +- .../Admin/AnalyticsLogAdminController.swift | 2 +- .../Api/AnalyticsLogApiController.swift | 2 +- .../Database/Models/AnalyticsLogModel.swift | 2 +- .../Middlewares/AnalyticsLogMiddleware.swift | 2 +- .../Routers/AnalyticsRouter.swift | 2 +- .../Html/AnalyticsAdminWidgetTemplate.swift | 2 +- .../Html/AnalyticsOverviewTemplate.swift | 2 +- 12 files changed, 291 insertions(+), 12 deletions(-) create mode 100644 Package.resolved diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..141f792 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,277 @@ +{ + "object": { + "pins": [ + { + "package": "ALanguageParser", + "repositoryURL": "https://github.com/matsoftware/accept-language-parser", + "state": { + "branch": null, + "revision": "5f4992a66df9232cfc60af8f6bb4179b854551d4", + "version": "1.1.0" + } + }, + { + "package": "async-http-client", + "repositoryURL": "https://github.com/swift-server/async-http-client.git", + "state": { + "branch": null, + "revision": "78db67e5bf4a8543075787f228e8920097319281", + "version": "1.18.0" + } + }, + { + "package": "async-kit", + "repositoryURL": "https://github.com/vapor/async-kit.git", + "state": { + "branch": null, + "revision": "a61da00d404ec91d12766f1b9aac7d90777b484d", + "version": "1.17.0" + } + }, + { + "package": "console-kit", + "repositoryURL": "https://github.com/vapor/console-kit.git", + "state": { + "branch": null, + "revision": "447f1046fb4e9df40973fe426ecb24a6f0e8d3b4", + "version": "4.6.0" + } + }, + { + "package": "fluent", + "repositoryURL": "https://github.com/vapor/fluent", + "state": { + "branch": null, + "revision": "4b4d8bf15a06fd60137e9c543e5503c4b842654e", + "version": "4.8.0" + } + }, + { + "package": "fluent-kit", + "repositoryURL": "https://github.com/vapor/fluent-kit.git", + "state": { + "branch": null, + "revision": "e53acf986e32c54fe522b2c12f737baa01828c1c", + "version": "1.42.2" + } + }, + { + "package": "liquid", + "repositoryURL": "https://github.com/binarybirds/liquid", + "state": { + "branch": null, + "revision": "865eca0fd64273fd4352c26db6f0019d254102cb", + "version": "1.3.2" + } + }, + { + "package": "liquid-kit", + "repositoryURL": "https://github.com/binarybirds/liquid-kit.git", + "state": { + "branch": null, + "revision": "d2532e66faad5df4c63d85c7a2fdecc25a679916", + "version": "1.3.4" + } + }, + { + "package": "mail", + "repositoryURL": "https://github.com/binarybirds/mail", + "state": { + "branch": null, + "revision": "f1dc8be5ea3b80952fb000b32d69609961b0b3bf", + "version": "0.0.2" + } + }, + { + "package": "mail-kit", + "repositoryURL": "https://github.com/binarybirds/mail-kit.git", + "state": { + "branch": null, + "revision": "3432472362c20e1537da8047c134f223b59dadd2", + "version": "0.0.1" + } + }, + { + "package": "multipart-kit", + "repositoryURL": "https://github.com/vapor/multipart-kit.git", + "state": { + "branch": null, + "revision": "1adfd69df2da08f7931d4281b257475e32c96734", + "version": "4.5.4" + } + }, + { + "package": "routing-kit", + "repositoryURL": "https://github.com/vapor/routing-kit.git", + "state": { + "branch": null, + "revision": "611bc45c5dfb1f54b84d99b89d1f72191fb6b71b", + "version": "4.7.2" + } + }, + { + "package": "sql-kit", + "repositoryURL": "https://github.com/vapor/sql-kit.git", + "state": { + "branch": null, + "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" + } + }, + { + "package": "swift-backtrace", + "repositoryURL": "https://github.com/swift-server/swift-backtrace.git", + "state": { + "branch": null, + "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" + } + }, + { + "package": "swift-crypto", + "repositoryURL": "https://github.com/apple/swift-crypto.git", + "state": { + "branch": null, + "revision": "33a20e650c33f6d72d822d558333f2085effa3dc", + "version": "2.5.0" + } + }, + { + "package": "swift-html", + "repositoryURL": "https://github.com/binarybirds/swift-html", + "state": { + "branch": null, + "revision": "f4fa5bc83fbee8dbd301c6fbb3969437415adad0", + "version": "1.7.0" + } + }, + { + "package": "swift-log", + "repositoryURL": "https://github.com/apple/swift-log.git", + "state": { + "branch": null, + "revision": "32e8d724467f8fe623624570367e3d50c5638e46", + "version": "1.5.2" + } + }, + { + "package": "swift-metrics", + "repositoryURL": "https://github.com/apple/swift-metrics.git", + "state": { + "branch": null, + "revision": "e8bced74bc6d747745935e469f45d03f048d6cbd", + "version": "2.3.4" + } + }, + { + "package": "swift-nio", + "repositoryURL": "https://github.com/apple/swift-nio.git", + "state": { + "branch": null, + "revision": "2d8e6ca36fe3e8ed74b0883f593757a45463c34d", + "version": "2.53.0" + } + }, + { + "package": "swift-nio-extras", + "repositoryURL": "https://github.com/apple/swift-nio-extras.git", + "state": { + "branch": null, + "revision": "0e0d0aab665ff1a0659ce75ac003081f2b1c8997", + "version": "1.19.0" + } + }, + { + "package": "swift-nio-http2", + "repositoryURL": "https://github.com/apple/swift-nio-http2.git", + "state": { + "branch": null, + "revision": "6d021a48483dbb273a9be43f65234bdc9185b364", + "version": "1.26.0" + } + }, + { + "package": "swift-nio-ssl", + "repositoryURL": "https://github.com/apple/swift-nio-ssl.git", + "state": { + "branch": null, + "revision": "e866a626e105042a6a72a870c88b4c531ba05f83", + "version": "2.24.0" + } + }, + { + "package": "swift-nio-transport-services", + "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git", + "state": { + "branch": null, + "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" + } + }, + { + "package": "UAParserSwift", + "repositoryURL": "https://github.com/malcommac/UAParserSwift", + "state": { + "branch": null, + "revision": "a8057c7cff60db2cdf31d0a0a68ce430754ab64e", + "version": "1.2.1" + } + }, + { + "package": "vapor", + "repositoryURL": "https://github.com/vapor/vapor", + "state": { + "branch": null, + "revision": "8b79ff0bd264a33bd0b7471dcf50dd1be983f992", + "version": "4.76.3" + } + }, + { + "package": "websocket-kit", + "repositoryURL": "https://github.com/vapor/websocket-kit.git", + "state": { + "branch": null, + "revision": "2ec14506d5f8199926906dc5a620ac22b147db86", + "version": "2.13.0" + } + } + ] + }, + "version": 1 +} diff --git a/Package.swift b/Package.swift index b86f38d..a0957c2 100644 --- a/Package.swift +++ b/Package.swift @@ -10,8 +10,10 @@ let package = Package( .library(name: "AnalyticsModule", targets: ["AnalyticsModule"]), ], dependencies: [ - .package(url: "https://github.com/Rando-Coderissian/feather-core", .branch("test-refactored-modules")), - .package(url: "https://github.com/Rando-Coderissian/analytics-objects", .branch("test-refactor-modules")), + .package(path: "../feather-core"), + .package(path: "../analytics-objects"), +// .package(url: "https://github.com/Rando-Coderissian/feather-core", .branch("test-refactored-modules")), +// .package(url: "https://github.com/Rando-Coderissian/analytics-objects", .branch("test-refactor-modules")), .package(url: "https://github.com/malcommac/UAParserSwift", from: "1.2.1"), .package(name: "ALanguageParser", url: "https://github.com/matsoftware/accept-language-parser", from: "1.0.0"), .package(url: "https://github.com/vapor/sql-kit.git", from: "3.0.0"), diff --git a/Sources/AnalyticsModule/AnalyticsBuilder.swift b/Sources/AnalyticsModule/AnalyticsBuilder.swift index 56bf40a..ed62476 100644 --- a/Sources/AnalyticsModule/AnalyticsBuilder.swift +++ b/Sources/AnalyticsModule/AnalyticsBuilder.swift @@ -5,7 +5,7 @@ // Created by Tibor Bodecs on 2021. 12. 27.. // -import Feather +import FeatherCore @_cdecl("createAnalyticsModule") public func createAnalyticsModule() -> UnsafeMutableRawPointer { diff --git a/Sources/AnalyticsModule/AnalyticsModule.swift b/Sources/AnalyticsModule/AnalyticsModule.swift index d4ad89e..af7d401 100644 --- a/Sources/AnalyticsModule/AnalyticsModule.swift +++ b/Sources/AnalyticsModule/AnalyticsModule.swift @@ -5,7 +5,7 @@ // Created by Tibor Bodecs on 2021. 12. 26.. // -import Feather +import FeatherCore import FeatherObjects import Vapor import AnalyticsObjects diff --git a/Sources/AnalyticsModule/Controllers/Admin/AnalyticsAdminController.swift b/Sources/AnalyticsModule/Controllers/Admin/AnalyticsAdminController.swift index 35b41de..a6bf6ec 100644 --- a/Sources/AnalyticsModule/Controllers/Admin/AnalyticsAdminController.swift +++ b/Sources/AnalyticsModule/Controllers/Admin/AnalyticsAdminController.swift @@ -5,7 +5,7 @@ // Created by Tibor Bodecs on 2021. 12. 26.. // -import Feather +import FeatherCore import Vapor import SQLKit import FeatherIcons diff --git a/Sources/AnalyticsModule/Controllers/Admin/AnalyticsLogAdminController.swift b/Sources/AnalyticsModule/Controllers/Admin/AnalyticsLogAdminController.swift index 8fff7d6..5f4ccd9 100644 --- a/Sources/AnalyticsModule/Controllers/Admin/AnalyticsLogAdminController.swift +++ b/Sources/AnalyticsModule/Controllers/Admin/AnalyticsLogAdminController.swift @@ -5,7 +5,7 @@ // Created by Tibor Bodecs on 2021. 12. 26.. // -import Feather +import FeatherCore import Vapor import AnalyticsObjects diff --git a/Sources/AnalyticsModule/Controllers/Api/AnalyticsLogApiController.swift b/Sources/AnalyticsModule/Controllers/Api/AnalyticsLogApiController.swift index 879e7c1..b8b3775 100644 --- a/Sources/AnalyticsModule/Controllers/Api/AnalyticsLogApiController.swift +++ b/Sources/AnalyticsModule/Controllers/Api/AnalyticsLogApiController.swift @@ -5,7 +5,7 @@ // Created by Tibor Bodecs on 2021. 12. 26.. // -import Feather +import FeatherCore import Vapor import AnalyticsObjects diff --git a/Sources/AnalyticsModule/Database/Models/AnalyticsLogModel.swift b/Sources/AnalyticsModule/Database/Models/AnalyticsLogModel.swift index 9648b08..82ef2cd 100644 --- a/Sources/AnalyticsModule/Database/Models/AnalyticsLogModel.swift +++ b/Sources/AnalyticsModule/Database/Models/AnalyticsLogModel.swift @@ -5,7 +5,7 @@ // Created by Tibor Bodecs on 2021. 12. 26.. // -import Feather +import FeatherCore import Vapor import Fluent diff --git a/Sources/AnalyticsModule/Middlewares/AnalyticsLogMiddleware.swift b/Sources/AnalyticsModule/Middlewares/AnalyticsLogMiddleware.swift index c378b14..a142216 100644 --- a/Sources/AnalyticsModule/Middlewares/AnalyticsLogMiddleware.swift +++ b/Sources/AnalyticsModule/Middlewares/AnalyticsLogMiddleware.swift @@ -5,7 +5,7 @@ // Created by Tibor Bodecs on 2021. 12. 26.. // -import Feather +import FeatherCore import Vapor import UAParserSwift import ALanguageParser diff --git a/Sources/AnalyticsModule/Routers/AnalyticsRouter.swift b/Sources/AnalyticsModule/Routers/AnalyticsRouter.swift index 182eb65..bdeb472 100644 --- a/Sources/AnalyticsModule/Routers/AnalyticsRouter.swift +++ b/Sources/AnalyticsModule/Routers/AnalyticsRouter.swift @@ -5,7 +5,7 @@ // Created by Tibor Bodecs on 2021. 12. 26.. // -import Feather +import FeatherCore import Vapor import AnalyticsObjects diff --git a/Sources/AnalyticsModule/Templates/Html/AnalyticsAdminWidgetTemplate.swift b/Sources/AnalyticsModule/Templates/Html/AnalyticsAdminWidgetTemplate.swift index 58aab20..22765a9 100644 --- a/Sources/AnalyticsModule/Templates/Html/AnalyticsAdminWidgetTemplate.swift +++ b/Sources/AnalyticsModule/Templates/Html/AnalyticsAdminWidgetTemplate.swift @@ -5,7 +5,7 @@ // Created by Tibor Bodecs on 2021. 12. 26.. // -import Feather +import FeatherCore import Vapor import SwiftHtml import FeatherIcons diff --git a/Sources/AnalyticsModule/Templates/Html/AnalyticsOverviewTemplate.swift b/Sources/AnalyticsModule/Templates/Html/AnalyticsOverviewTemplate.swift index 0883773..55dd6c9 100644 --- a/Sources/AnalyticsModule/Templates/Html/AnalyticsOverviewTemplate.swift +++ b/Sources/AnalyticsModule/Templates/Html/AnalyticsOverviewTemplate.swift @@ -5,7 +5,7 @@ // Created by Tibor Bodecs on 2021. 12. 26.. // -import Feather +import FeatherCore import Vapor import SwiftHtml import SwiftSvg From b36df7903c5f45d1481abde8ee0392e04274cfe8 Mon Sep 17 00:00:00 2001 From: Joshua Kaunert <44586402+jkaunert@users.noreply.github.com> Date: Sat, 27 May 2023 18:21:48 -0500 Subject: [PATCH 3/4] re-enables remote SP --- Package.resolved | 36 ++++++++++++++++++++++++++++++++++++ Package.swift | 10 ++++++---- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/Package.resolved b/Package.resolved index 141f792..bcbc350 100644 --- a/Package.resolved +++ b/Package.resolved @@ -10,6 +10,15 @@ "version": "1.1.0" } }, + { + "package": "analytics-objects", + "repositoryURL": "https://github.com/Rando-Coderissian/analytics-objects", + "state": { + "branch": "test-custom-config", + "revision": "30029cf04db8211d1c803925e594495c1259e26e", + "version": null + } + }, { "package": "async-http-client", "repositoryURL": "https://github.com/swift-server/async-http-client.git", @@ -37,6 +46,33 @@ "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", + "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 a0957c2..41dc00f 100644 --- a/Package.swift +++ b/Package.swift @@ -10,10 +10,12 @@ let package = Package( .library(name: "AnalyticsModule", targets: ["AnalyticsModule"]), ], dependencies: [ - .package(path: "../feather-core"), - .package(path: "../analytics-objects"), -// .package(url: "https://github.com/Rando-Coderissian/feather-core", .branch("test-refactored-modules")), -// .package(url: "https://github.com/Rando-Coderissian/analytics-objects", .branch("test-refactor-modules")), +// .package(path: "../feather-core"), +// .package(path: "../analytics-objects"), + .package(url: "https://github.com/Rando-Coderissian/feather-core", .branch("test-refactored-modules")), + .package(url: "https://github.com/Rando-Coderissian/analytics-objects", .branch("test-custom-config")), +// .package(url: "https://github.com/feathercms/feather-core", .branch("dev")), +// .package(url: "https://github.com/feathercms/analytics-objects", .branch("dev")), .package(url: "https://github.com/malcommac/UAParserSwift", from: "1.2.1"), .package(name: "ALanguageParser", url: "https://github.com/matsoftware/accept-language-parser", from: "1.0.0"), .package(url: "https://github.com/vapor/sql-kit.git", from: "3.0.0"), From 2de8f7f89530325c16955488b7d27805b961203a Mon Sep 17 00:00:00 2001 From: Joshua Kaunert <44586402+jkaunert@users.noreply.github.com> Date: Mon, 29 May 2023 08:17:48 -0500 Subject: [PATCH 4/4] refactor dep urls for merge --- Package.swift | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index 41dc00f..c66cf5f 100644 --- a/Package.swift +++ b/Package.swift @@ -10,12 +10,8 @@ let package = Package( .library(name: "AnalyticsModule", targets: ["AnalyticsModule"]), ], dependencies: [ -// .package(path: "../feather-core"), -// .package(path: "../analytics-objects"), - .package(url: "https://github.com/Rando-Coderissian/feather-core", .branch("test-refactored-modules")), - .package(url: "https://github.com/Rando-Coderissian/analytics-objects", .branch("test-custom-config")), -// .package(url: "https://github.com/feathercms/feather-core", .branch("dev")), -// .package(url: "https://github.com/feathercms/analytics-objects", .branch("dev")), + .package(url: "https://github.com/feathercms/feather-core", .branch("dev")), + .package(url: "https://github.com/feathercms/analytics-objects", .branch("dev")), .package(url: "https://github.com/malcommac/UAParserSwift", from: "1.2.1"), .package(name: "ALanguageParser", url: "https://github.com/matsoftware/accept-language-parser", from: "1.0.0"), .package(url: "https://github.com/vapor/sql-kit.git", from: "3.0.0"),