Skip to content

Commit

Permalink
Merge pull request #4 from facile-it/hotfix/broken-spm
Browse files Browse the repository at this point in the history 
Fix broken spm dependencies
  • Loading branch information
@ChrisMyrants
ChrisMyrants authored Mar 30, 2021
2 parents 457f2c4 + d15b4e9 commit ddc4c6c
Show file tree
Hide file tree
Showing 9 changed files with 79 additions and 29 deletions.
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
View file

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

32 changes: 16 additions & 16 deletions NavigationHelper.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

/* Begin PBXBuildFile section */
382B6A862177647F006D6C89 /* AnyPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 382B6A852177647F006D6C89 /* AnyPresenter.swift */; };
382B6A88217764E0006D6C89 /* SplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 382B6A87217764E0006D6C89 /* SplitViewController.swift */; };
382B6A89217765D4006D6C89 /* AnyPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 382B6A852177647F006D6C89 /* AnyPresenter.swift */; };
383F2B4D2029F84D00B8CA58 /* NavigationHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 383F2B4B2029F84D00B8CA58 /* NavigationHelper.h */; settings = {ATTRIBUTES = (Public, ); }; };
383F2B582029F89900B8CA58 /* Protocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 383F2B552029F89900B8CA58 /* Protocols.swift */; };
Expand All @@ -25,9 +24,6 @@
383F2B822029F9BC00B8CA58 /* Transition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 383F2B562029F89900B8CA58 /* Transition.swift */; };
383F2B832029F9BC00B8CA58 /* SerialHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 383F2B572029F89900B8CA58 /* SerialHandler.swift */; };
383F2B8D2029FA2B00B8CA58 /* NavigationHelperUIKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 383F2B8B2029FA2B00B8CA58 /* NavigationHelperUIKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
383F2B942029FA3F00B8CA58 /* TabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 383F2B912029FA3E00B8CA58 /* TabBarController.swift */; };
383F2B952029FA3F00B8CA58 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 383F2B922029FA3E00B8CA58 /* ViewController.swift */; };
383F2B962029FA3F00B8CA58 /* NavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 383F2B932029FA3E00B8CA58 /* NavigationController.swift */; };
383F2B972029FA4900B8CA58 /* Abstract.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 383F2B7B2029F9A600B8CA58 /* Abstract.framework */; };
383F2B982029FA4900B8CA58 /* FunctionalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 383F2B7C2029F9A600B8CA58 /* FunctionalKit.framework */; };
383F2BA22029FA7100B8CA58 /* NavigationHelper.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 383F2B482029F84D00B8CA58 /* NavigationHelper.framework */; };
Expand All @@ -47,6 +43,10 @@
3F0D528D219D82D100F3B0EA /* Log.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F0D528B219D82C900F3B0EA /* Log.swift */; };
3F0D5291219D89F400F3B0EA /* Log.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F0D5286219D826600F3B0EA /* Log.framework */; };
3F0D5292219D89F600F3B0EA /* Log.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3F0D5286219D826600F3B0EA /* Log.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8382A2B12611DD7D000E5FD5 /* SplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8382A2AD2611DD7D000E5FD5 /* SplitViewController.swift */; };
8382A2B22611DD7D000E5FD5 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8382A2AE2611DD7D000E5FD5 /* ViewController.swift */; };
8382A2B32611DD7D000E5FD5 /* TabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8382A2AF2611DD7D000E5FD5 /* TabBarController.swift */; };
8382A2B42611DD7D000E5FD5 /* NavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8382A2B02611DD7D000E5FD5 /* NavigationController.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -84,7 +84,6 @@

/* Begin PBXFileReference section */
382B6A852177647F006D6C89 /* AnyPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyPresenter.swift; sourceTree = "<group>"; };
382B6A87217764E0006D6C89 /* SplitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitViewController.swift; sourceTree = "<group>"; };
383F2B482029F84D00B8CA58 /* NavigationHelper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NavigationHelper.framework; sourceTree = BUILT_PRODUCTS_DIR; };
383F2B4B2029F84D00B8CA58 /* NavigationHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NavigationHelper.h; sourceTree = "<group>"; };
383F2B4C2029F84D00B8CA58 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand All @@ -103,9 +102,6 @@
383F2B892029FA2A00B8CA58 /* NavigationHelperUIKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NavigationHelperUIKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
383F2B8B2029FA2B00B8CA58 /* NavigationHelperUIKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NavigationHelperUIKit.h; sourceTree = "<group>"; };
383F2B8C2029FA2B00B8CA58 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
383F2B912029FA3E00B8CA58 /* TabBarController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabBarController.swift; sourceTree = "<group>"; };
383F2B922029FA3E00B8CA58 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
383F2B932029FA3E00B8CA58 /* NavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationController.swift; sourceTree = "<group>"; };
383F2B9D2029FA7100B8CA58 /* NavigationHelperTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NavigationHelperTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
383F2BA12029FA7100B8CA58 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
383F2BA92029FAB000B8CA58 /* LinuxMain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LinuxMain.swift; sourceTree = "<group>"; };
Expand All @@ -118,6 +114,10 @@
3F0D5288219D827600F3B0EA /* Log.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Log.framework; path = Carthage/Build/iOS/Log.framework; sourceTree = "<group>"; };
3F0D528B219D82C900F3B0EA /* Log.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Log.swift; sourceTree = "<group>"; };
65854C9325C2C4630036D8C6 /* Cartfile */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cartfile; sourceTree = "<group>"; };
8382A2AD2611DD7D000E5FD5 /* SplitViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SplitViewController.swift; path = Sources/NavigationHelperUIKit/SplitViewController.swift; sourceTree = SOURCE_ROOT; };
8382A2AE2611DD7D000E5FD5 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewController.swift; path = Sources/NavigationHelperUIKit/ViewController.swift; sourceTree = SOURCE_ROOT; };
8382A2AF2611DD7D000E5FD5 /* TabBarController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TabBarController.swift; path = Sources/NavigationHelperUIKit/TabBarController.swift; sourceTree = SOURCE_ROOT; };
8382A2B02611DD7D000E5FD5 /* NavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NavigationController.swift; path = Sources/NavigationHelperUIKit/NavigationController.swift; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -270,10 +270,10 @@
children = (
383F2B8B2029FA2B00B8CA58 /* NavigationHelperUIKit.h */,
383F2B8C2029FA2B00B8CA58 /* Info.plist */,
383F2B932029FA3E00B8CA58 /* NavigationController.swift */,
382B6A87217764E0006D6C89 /* SplitViewController.swift */,
383F2B912029FA3E00B8CA58 /* TabBarController.swift */,
383F2B922029FA3E00B8CA58 /* ViewController.swift */,
8382A2B02611DD7D000E5FD5 /* NavigationController.swift */,
8382A2AD2611DD7D000E5FD5 /* SplitViewController.swift */,
8382A2AF2611DD7D000E5FD5 /* TabBarController.swift */,
8382A2AE2611DD7D000E5FD5 /* ViewController.swift */,
);
path = NavigationHelperUIKit;
sourceTree = "<group>";
Expand Down Expand Up @@ -539,10 +539,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
383F2B952029FA3F00B8CA58 /* ViewController.swift in Sources */,
383F2B962029FA3F00B8CA58 /* NavigationController.swift in Sources */,
383F2B942029FA3F00B8CA58 /* TabBarController.swift in Sources */,
382B6A88217764E0006D6C89 /* SplitViewController.swift in Sources */,
8382A2B22611DD7D000E5FD5 /* ViewController.swift in Sources */,
8382A2B42611DD7D000E5FD5 /* NavigationController.swift in Sources */,
8382A2B12611DD7D000E5FD5 /* SplitViewController.swift in Sources */,
8382A2B32611DD7D000E5FD5 /* TabBarController.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
49 changes: 38 additions & 11 deletions Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,44 @@
"repositoryURL": "https://github.com/typelift/Abstract.git",
"state": {
"branch": null,
"revision": "68fcd8e6b827d1c8948c43760cebb02a4fbee866",
"version": "0.0.2"
"revision": "77f2902ff68f218daa8040251c148c328be82845",
"version": "0.1.0"
}
},
{
"package": "Chalk",
"repositoryURL": "https://github.com/mxcl/Chalk.git",
"state": {
"branch": null,
"revision": "9aa9f348b86db3cf6702a3e43c081ecec80cf3c7",
"version": "0.4.0"
}
},
{
"package": "FileCheck",
"repositoryURL": "https://github.com/trill-lang/FileCheck.git",
"repositoryURL": "https://github.com/llvm-swift/FileCheck.git",
"state": {
"branch": null,
"revision": "1c966580c83cf2e41be802992d46fe2edfc5c95f",
"version": "0.0.5"
"revision": "0dc8a5bff1a7f01e1d7bcc20c79e2127b2ea3eeb",
"version": "0.2.5"
}
},
{
"package": "FunctionalKit",
"repositoryURL": "https://github.com/facile-it/FunctionalKit.git",
"state": {
"branch": null,
"revision": "c5190900e3114d358e076a8c2675a31ace9f819a",
"version": "0.4.0"
"revision": "e465a4727fd664bfb2191c719567dee8eb57effe",
"version": "0.23.0"
}
},
{
"package": "Log",
"repositoryURL": "https://gitlab.facile.it/mobile-apps/Log",
"state": {
"branch": null,
"revision": "7acd50e41fb9189f19a8e1250eb6192b8eae3b31",
"version": "0.5.0"
}
},
{
Expand All @@ -42,17 +60,26 @@
"repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
"state": {
"branch": null,
"revision": "e479d0029db0575e03e3c092e1c9724b9410eab7",
"version": "4.1.1"
"revision": "254617dd7fae0c45319ba5fbea435bf4d0e15b5d",
"version": "5.1.2"
}
},
{
"package": "swift-argument-parser",
"repositoryURL": "https://github.com/apple/swift-argument-parser",
"state": {
"branch": null,
"revision": "831ed5e860a70e745bc1337830af4786b2576881",
"version": "0.4.1"
}
},
{
"package": "SwiftCheck",
"repositoryURL": "https://github.com/typelift/SwiftCheck.git",
"state": {
"branch": null,
"revision": "df82fb889864945c64458f38846702af729b3ee4",
"version": "0.9.1"
"revision": "077c096c3ddfc38db223ac8e525ad16ffb987138",
"version": "0.12.0"
}
}
]
Expand Down
19 changes: 17 additions & 2 deletions Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,17 @@ let package = Package(
.library(
name: "NavigationHelper",
targets: ["NavigationHelper"]),
.library(
name: "NavigationHelperUIKit",
targets: ["NavigationHelperUIKit"])
],
dependencies: [
// Dependencies declare other packages that this package depends on.
// .package(url: /* package url */, from: "1.0.0"),
.package(url: "https://github.com/facile-it/FunctionalKit.git", from: Version(0,0,0)),
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "4.0.0")
.package(url: "https://github.com/facile-it/FunctionalKit.git", from: Version(0,23,0)),
.package(url: "https://github.com/typelift/Abstract.git", from: Version(0,1,0)),
.package(url: "https://gitlab.facile.it/mobile-apps/Log", from: Version(0,5,0)),
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0")
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
Expand All @@ -24,8 +29,18 @@ let package = Package(
name: "NavigationHelper",
dependencies: [
"FunctionalKit",
"Abstract",
"Log",
"RxSwift"
]),
.target(
name: "NavigationHelperUIKit",
dependencies: [
"FunctionalKit",
"Abstract",
"Log",
"RxSwift"
]),
.testTarget(
name: "NavigationHelperTests",
dependencies: ["NavigationHelper"]),
Expand Down
1 change: 1 addition & 0 deletions Sources/NavigationHelper/SerialHandler.swift
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import FunctionalKit
import RxSwift
import Foundation

public final class SerialHandler<Message>: CustomStringConvertible where Message: Hashable & Executable {
private let messageSubject = PublishSubject<Message>()
Expand Down
0 ...ionHelperUIKit/NavigationController.swift → ...ionHelperUIKit/NavigationController.swift
View file
File renamed without changes.
0 ...tionHelperUIKit/SplitViewController.swift → ...tionHelperUIKit/SplitViewController.swift
View file
File renamed without changes.
0 NavigationHelperUIKit/TabBarController.swift → ...igationHelperUIKit/TabBarController.swift
View file
File renamed without changes.
0 NavigationHelperUIKit/ViewController.swift → ...avigationHelperUIKit/ViewController.swift
View file
File renamed without changes.

0 comments on commit ddc4c6c

Please sign in to comment.