Skip to content
This repository was archived by the owner on Nov 19, 2023. It is now read-only.

Housekeeping and refactor - fixes issues #64 & #65. #4

Open
jkaunert wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

Housekeeping and refactor - fixes issues #64 & #65. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc64089
rename/resolve deps
jkaunert May 27, 2023
d93e606
re-enable remote SP
jkaunert May 27, 2023
e5b4c72
resolves deps
jkaunert May 28, 2023
2272b89
refactor dep urls for merge
jkaunert May 29, 2023
9612005
Merge branch 'refactor-modules' into dev
jkaunert May 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 90 additions & 54 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ let package = Package(
.library(name: "BlogModule", targets: ["BlogModule"]),
],
dependencies: [
.package(url: "https://github.com/feathercms/feather-core", .branch("dev")),
.package(url: "https://github.com/feathercms/blog-objects", .branch("main")),
.package(url: "https://github.com/feathercms/web-module", .branch("main")),
.package(url: "https://github.com/feathercms/feather-core", .branch("dev")),
.package(url: "https://github.com/feathercms/blog-objects", .branch("main")),
.package(url: "https://github.com/feathercms/web-module", .branch("main")),
],
targets: [
.target(name: "BlogModule", dependencies: [
.product(name: "Feather", package: "feather-core"),
.product(name: "FeatherCore", package: "feather-core"),
.product(name: "BlogObjects", package: "blog-objects"),
.product(name: "WebModule", package: "web-module"),
],
Expand Down
2 changes: 1 addition & 1 deletion Sources/BlogModule/BlogBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Created by Tibor Bodecs on 2021. 12. 27..
//

import Feather
import FeatherCore

@_cdecl("createBlogModule")
public func createBlogModule() -> UnsafeMutableRawPointer {
Expand Down
2 changes: 1 addition & 1 deletion Sources/BlogModule/BlogModule.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Vapor
import Fluent
import Feather
import FeatherCore
import FeatherObjects
import BlogObjects
import WebModule
Expand Down
2 changes: 1 addition & 1 deletion Sources/BlogModule/Controllers/Admin/BlogAuthorAdminController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Vapor
import Fluent
import Feather
import FeatherCore
import FeatherObjects
import BlogObjects

Expand Down
2 changes: 1 addition & 1 deletion Sources/BlogModule/Controllers/Admin/BlogAuthorLinkAdminController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Vapor
import Fluent
import Feather
import FeatherCore
import BlogObjects


Expand Down
2 changes: 1 addition & 1 deletion Sources/BlogModule/Controllers/Admin/BlogCategoryAdminController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Vapor
import Fluent
import Feather
import FeatherCore
import BlogObjects

struct BlogCategoryAdminController: AdminController {
Expand Down
2 changes: 1 addition & 1 deletion Sources/BlogModule/Controllers/Admin/BlogPostAdminController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Vapor
import Fluent
import Feather
import FeatherCore
import BlogObjects


Expand Down
2 changes: 1 addition & 1 deletion Sources/BlogModule/Controllers/Api/BlogAuthorApiController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Vapor
import Fluent
import Feather
import FeatherCore
import BlogObjects


Expand Down
Loading