From d15b4e9c12ff3464f59a2daf526b847dbde52713 Mon Sep 17 00:00:00 2001 From: Christian Miranti Date: Mon, 29 Mar 2021 12:04:54 +0200 Subject: [PATCH] Add NavigationHelperUIKit target --- NavigationHelper.xcodeproj/project.pbxproj | 32 +++++++++---------- Package.swift | 11 +++++++ .../NavigationController.swift | 0 .../SplitViewController.swift | 0 .../TabBarController.swift | 0 .../ViewController.swift | 0 6 files changed, 27 insertions(+), 16 deletions(-) rename {NavigationHelperUIKit => Sources/NavigationHelperUIKit}/NavigationController.swift (100%) rename {NavigationHelperUIKit => Sources/NavigationHelperUIKit}/SplitViewController.swift (100%) rename {NavigationHelperUIKit => Sources/NavigationHelperUIKit}/TabBarController.swift (100%) rename {NavigationHelperUIKit => Sources/NavigationHelperUIKit}/ViewController.swift (100%) diff --git a/NavigationHelper.xcodeproj/project.pbxproj b/NavigationHelper.xcodeproj/project.pbxproj index 9ffc7a7..b0a4266 100644 --- a/NavigationHelper.xcodeproj/project.pbxproj +++ b/NavigationHelper.xcodeproj/project.pbxproj @@ -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 */; }; @@ -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 */; }; @@ -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 */ @@ -84,7 +84,6 @@ /* Begin PBXFileReference section */ 382B6A852177647F006D6C89 /* AnyPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyPresenter.swift; sourceTree = ""; }; - 382B6A87217764E0006D6C89 /* SplitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitViewController.swift; sourceTree = ""; }; 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 = ""; }; 383F2B4C2029F84D00B8CA58 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -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 = ""; }; 383F2B8C2029FA2B00B8CA58 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 383F2B912029FA3E00B8CA58 /* TabBarController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabBarController.swift; sourceTree = ""; }; - 383F2B922029FA3E00B8CA58 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - 383F2B932029FA3E00B8CA58 /* NavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationController.swift; sourceTree = ""; }; 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 = ""; }; 383F2BA92029FAB000B8CA58 /* LinuxMain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LinuxMain.swift; sourceTree = ""; }; @@ -118,6 +114,10 @@ 3F0D5288219D827600F3B0EA /* Log.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Log.framework; path = Carthage/Build/iOS/Log.framework; sourceTree = ""; }; 3F0D528B219D82C900F3B0EA /* Log.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Log.swift; sourceTree = ""; }; 65854C9325C2C4630036D8C6 /* Cartfile */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cartfile; sourceTree = ""; }; + 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 */ @@ -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 = ""; @@ -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; }; diff --git a/Package.swift b/Package.swift index eaa2e4f..09778e1 100644 --- a/Package.swift +++ b/Package.swift @@ -10,6 +10,9 @@ let package = Package( .library( name: "NavigationHelper", targets: ["NavigationHelper"]), + .library( + name: "NavigationHelperUIKit", + targets: ["NavigationHelperUIKit"]) ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -30,6 +33,14 @@ let package = Package( "Log", "RxSwift" ]), + .target( + name: "NavigationHelperUIKit", + dependencies: [ + "FunctionalKit", + "Abstract", + "Log", + "RxSwift" + ]), .testTarget( name: "NavigationHelperTests", dependencies: ["NavigationHelper"]), diff --git a/NavigationHelperUIKit/NavigationController.swift b/Sources/NavigationHelperUIKit/NavigationController.swift similarity index 100% rename from NavigationHelperUIKit/NavigationController.swift rename to Sources/NavigationHelperUIKit/NavigationController.swift diff --git a/NavigationHelperUIKit/SplitViewController.swift b/Sources/NavigationHelperUIKit/SplitViewController.swift similarity index 100% rename from NavigationHelperUIKit/SplitViewController.swift rename to Sources/NavigationHelperUIKit/SplitViewController.swift diff --git a/NavigationHelperUIKit/TabBarController.swift b/Sources/NavigationHelperUIKit/TabBarController.swift similarity index 100% rename from NavigationHelperUIKit/TabBarController.swift rename to Sources/NavigationHelperUIKit/TabBarController.swift diff --git a/NavigationHelperUIKit/ViewController.swift b/Sources/NavigationHelperUIKit/ViewController.swift similarity index 100% rename from NavigationHelperUIKit/ViewController.swift rename to Sources/NavigationHelperUIKit/ViewController.swift