diff --git a/KissMe.xcodeproj/project.pbxproj b/KissMe.xcodeproj/project.pbxproj index 9f3618e..37e442e 100644 --- a/KissMe.xcodeproj/project.pbxproj +++ b/KissMe.xcodeproj/project.pbxproj @@ -127,7 +127,8 @@ 341F5EF42A0F891200962D48 /* KissAccount.swift */, 341F5F0A2A15115400962D48 /* KissShop.swift */, ); - path = KissMe; + name = KissMe; + path = KissMe/Sources; sourceTree = ""; }; 341F5EB92A0A80EC00962D48 /* KissMeTests */ = { @@ -135,7 +136,8 @@ children = ( 341F5EBA2A0A80EC00962D48 /* KissMeTests.swift */, ); - path = KissMeTests; + name = KissMeTests; + path = KissMe/Tests; sourceTree = ""; }; 341F5EDF2A0F372000962D48 /* Login */ = { diff --git a/KissMe.xcworkspace/contents.xcworkspacedata b/KissMe.xcworkspace/contents.xcworkspacedata index 292f961..91bba38 100644 --- a/KissMe.xcworkspace/contents.xcworkspacedata +++ b/KissMe.xcworkspace/contents.xcworkspacedata @@ -2,7 +2,7 @@ + location = "group:KissMeConsole.xcodeproj"> diff --git a/KissMeConsole/KissMeConsole.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/KissMe/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata similarity index 100% rename from KissMeConsole/KissMeConsole.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to KissMe/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata diff --git a/KissMe/Package.swift b/KissMe/Package.swift new file mode 100644 index 0000000..baf20be --- /dev/null +++ b/KissMe/Package.swift @@ -0,0 +1,33 @@ +// swift-tools-version: 5.8 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "KissMe", + platforms: [ + .macOS(.v13), .iOS(.v14), .tvOS(.v14) + ], + products: [ + // Products define the executables and libraries a package produces, and make them visible to other packages. + .library( + name: "KissMe", + targets: ["KissMe"]), + ], + dependencies: [ + // Dependencies declare other packages that this package depends on. + // .package(url: /* package url */, from: "1.0.0"), + ], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages this package depends on. + .target( + name: "KissMe", + dependencies: [], + path: "Sources"), + .testTarget( + name: "KissMeTests", + dependencies: ["KissMe"], + path: "Tests"), + ] +) diff --git a/KissMe/Common/AuthRequest.swift b/KissMe/Sources/Common/AuthRequest.swift similarity index 100% rename from KissMe/Common/AuthRequest.swift rename to KissMe/Sources/Common/AuthRequest.swift diff --git a/KissMe/Common/Credential.swift b/KissMe/Sources/Common/Credential.swift similarity index 100% rename from KissMe/Common/Credential.swift rename to KissMe/Sources/Common/Credential.swift diff --git a/KissMe/Common/KissExtensions.swift b/KissMe/Sources/Common/KissExtensions.swift similarity index 100% rename from KissMe/Common/KissExtensions.swift rename to KissMe/Sources/Common/KissExtensions.swift diff --git a/KissMe/Common/OrderRequest.swift b/KissMe/Sources/Common/OrderRequest.swift similarity index 100% rename from KissMe/Common/OrderRequest.swift rename to KissMe/Sources/Common/OrderRequest.swift diff --git a/KissMe/Common/Request.swift b/KissMe/Sources/Common/Request.swift similarity index 100% rename from KissMe/Common/Request.swift rename to KissMe/Sources/Common/Request.swift diff --git a/KissMe/Common/SeibroRequest.swift b/KissMe/Sources/Common/SeibroRequest.swift similarity index 100% rename from KissMe/Common/SeibroRequest.swift rename to KissMe/Sources/Common/SeibroRequest.swift diff --git a/KissMe/Common/ShopRequest.swift b/KissMe/Sources/Common/ShopRequest.swift similarity index 100% rename from KissMe/Common/ShopRequest.swift rename to KissMe/Sources/Common/ShopRequest.swift diff --git a/KissMe/Domestic/DomesticFutures.swift b/KissMe/Sources/Domestic/DomesticFutures.swift similarity index 100% rename from KissMe/Domestic/DomesticFutures.swift rename to KissMe/Sources/Domestic/DomesticFutures.swift diff --git a/KissMe/Domestic/DomesticStock.swift b/KissMe/Sources/Domestic/DomesticStock.swift similarity index 99% rename from KissMe/Domestic/DomesticStock.swift rename to KissMe/Sources/Domestic/DomesticStock.swift index 6e00b5b..d7ca66f 100644 --- a/KissMe/Domestic/DomesticStock.swift +++ b/KissMe/Sources/Domestic/DomesticStock.swift @@ -311,7 +311,7 @@ extension KissAccount { public func cancelOrder() async throws -> Bool { return try await withUnsafeThrowingContinuation { continuation in - guard let accessToken = accessToken else { + guard let _ = accessToken else { continuation.resume(throwing: GeneralError.invalidAccessToken) return } @@ -324,7 +324,7 @@ extension KissAccount { public func changeOrder() async throws -> Bool { return try await withUnsafeThrowingContinuation { continuation in - guard let accessToken = accessToken else { + guard let _ = accessToken else { continuation.resume(throwing: GeneralError.invalidAccessToken) return } diff --git a/KissMe/Domestic/DomesticStockPrice.swift b/KissMe/Sources/Domestic/DomesticStockPrice.swift similarity index 100% rename from KissMe/Domestic/DomesticStockPrice.swift rename to KissMe/Sources/Domestic/DomesticStockPrice.swift diff --git a/KissMe/Domestic/DomesticStockPriceResult.swift b/KissMe/Sources/Domestic/DomesticStockPriceResult.swift similarity index 100% rename from KissMe/Domestic/DomesticStockPriceResult.swift rename to KissMe/Sources/Domestic/DomesticStockPriceResult.swift diff --git a/KissMe/Domestic/DomesticStockResult.swift b/KissMe/Sources/Domestic/DomesticStockResult.swift similarity index 100% rename from KissMe/Domestic/DomesticStockResult.swift rename to KissMe/Sources/Domestic/DomesticStockResult.swift diff --git a/KissMe/Domestic/DomesticStockSearch.swift b/KissMe/Sources/Domestic/DomesticStockSearch.swift similarity index 100% rename from KissMe/Domestic/DomesticStockSearch.swift rename to KissMe/Sources/Domestic/DomesticStockSearch.swift diff --git a/KissMe/Domestic/DomesticStockSearchResult.swift b/KissMe/Sources/Domestic/DomesticStockSearchResult.swift similarity index 100% rename from KissMe/Domestic/DomesticStockSearchResult.swift rename to KissMe/Sources/Domestic/DomesticStockSearchResult.swift diff --git a/KissMe/Domestic/Shop/DomesticShopProduct.swift b/KissMe/Sources/Domestic/Shop/DomesticShopProduct.swift similarity index 100% rename from KissMe/Domestic/Shop/DomesticShopProduct.swift rename to KissMe/Sources/Domestic/Shop/DomesticShopProduct.swift diff --git a/KissMe/Foreign/ForeignFutures.swift b/KissMe/Sources/Foreign/ForeignFutures.swift similarity index 100% rename from KissMe/Foreign/ForeignFutures.swift rename to KissMe/Sources/Foreign/ForeignFutures.swift diff --git a/KissMe/Foreign/ForeignStock.swift b/KissMe/Sources/Foreign/ForeignStock.swift similarity index 100% rename from KissMe/Foreign/ForeignStock.swift rename to KissMe/Sources/Foreign/ForeignStock.swift diff --git a/KissMe/Foreign/ForeignStockPrice.swift b/KissMe/Sources/Foreign/ForeignStockPrice.swift similarity index 100% rename from KissMe/Foreign/ForeignStockPrice.swift rename to KissMe/Sources/Foreign/ForeignStockPrice.swift diff --git a/KissMe/KissAccount.swift b/KissMe/Sources/KissAccount.swift similarity index 100% rename from KissMe/KissAccount.swift rename to KissMe/Sources/KissAccount.swift diff --git a/KissMe/KissMe.h b/KissMe/Sources/KissMe.h similarity index 100% rename from KissMe/KissMe.h rename to KissMe/Sources/KissMe.h diff --git a/KissMe/KissProfile.swift b/KissMe/Sources/KissProfile.swift similarity index 100% rename from KissMe/KissProfile.swift rename to KissMe/Sources/KissProfile.swift diff --git a/KissMe/KissShop.swift b/KissMe/Sources/KissShop.swift similarity index 100% rename from KissMe/KissShop.swift rename to KissMe/Sources/KissShop.swift diff --git a/KissMe/Login/Login.swift b/KissMe/Sources/Login/Login.swift similarity index 100% rename from KissMe/Login/Login.swift rename to KissMe/Sources/Login/Login.swift diff --git a/KissMe/Login/LoginResult.swift b/KissMe/Sources/Login/LoginResult.swift similarity index 100% rename from KissMe/Login/LoginResult.swift rename to KissMe/Sources/Login/LoginResult.swift diff --git a/KissMeTests/KissMeTests.swift b/KissMe/Tests/KissMeTests.swift similarity index 100% rename from KissMeTests/KissMeTests.swift rename to KissMe/Tests/KissMeTests.swift diff --git a/KissMeConsole/KissMeConsole.xcodeproj/project.pbxproj b/KissMeConsole.xcodeproj/project.pbxproj similarity index 99% rename from KissMeConsole/KissMeConsole.xcodeproj/project.pbxproj rename to KissMeConsole.xcodeproj/project.pbxproj index d9258c3..aa3e94e 100644 --- a/KissMeConsole/KissMeConsole.xcodeproj/project.pbxproj +++ b/KissMeConsole.xcodeproj/project.pbxproj @@ -84,7 +84,8 @@ 341F5F082A1463A100962D48 /* KissConsole.swift */, 349327F62A20E3E300097063 /* ConsoleExtensions.swift */, ); - path = KissMeConsole; + name = KissMeConsole; + path = KissMeConsole/Sources; sourceTree = ""; }; 341F5EDA2A0A8C4600962D48 /* Frameworks */ = { diff --git a/KissMeConsole.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/KissMeConsole.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/KissMeConsole.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/KissMeConsole/KissMeConsole.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/KissMeConsole.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from KissMeConsole/KissMeConsole.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to KissMeConsole.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/KissMeConsole/KissMeConsole.xcodeproj/xcshareddata/xcschemes/KissMeConsole on iTerm2.xcscheme b/KissMeConsole.xcodeproj/xcshareddata/xcschemes/KissMeConsole on iTerm2.xcscheme similarity index 100% rename from KissMeConsole/KissMeConsole.xcodeproj/xcshareddata/xcschemes/KissMeConsole on iTerm2.xcscheme rename to KissMeConsole.xcodeproj/xcshareddata/xcschemes/KissMeConsole on iTerm2.xcscheme diff --git a/KissMeConsole/KissMeConsole.xcodeproj/xcshareddata/xcschemes/KissMeConsole.xcscheme b/KissMeConsole.xcodeproj/xcshareddata/xcschemes/KissMeConsole.xcscheme similarity index 100% rename from KissMeConsole/KissMeConsole.xcodeproj/xcshareddata/xcschemes/KissMeConsole.xcscheme rename to KissMeConsole.xcodeproj/xcshareddata/xcschemes/KissMeConsole.xcscheme diff --git a/KissMeConsole/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/KissMeConsole/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/KissMeConsole/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/KissMeConsole/Package.swift b/KissMeConsole/Package.swift new file mode 100644 index 0000000..7df65dc --- /dev/null +++ b/KissMeConsole/Package.swift @@ -0,0 +1,34 @@ +// swift-tools-version: 5.8 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "KissMeConsole", + platforms: [ + .macOS(.v13), .iOS(.v14), .tvOS(.v14) + ], + products: [ + // Products define the executables and libraries a package produces, and make them visible to other packages. + .executable( + name: "KissMeConsole", + targets: ["KissMeConsole"]), + ], + dependencies: [ + // Dependencies declare other packages that this package depends on. + //.package(url: "../KissMe", from: "1.0.0"), + .package(path: "../KissMe"), + ], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages this package depends on. + .target( + name: "KissMeConsole", + dependencies: ["KissMe"], + path: "Sources"), + .testTarget( + name: "KissMeConsoleTests", + dependencies: ["KissMeConsole"], + path: "Tests"), + ] +) diff --git a/KissMeConsole/KissMeConsole/ConsoleExtensions.swift b/KissMeConsole/Sources/ConsoleExtensions.swift similarity index 100% rename from KissMeConsole/KissMeConsole/ConsoleExtensions.swift rename to KissMeConsole/Sources/ConsoleExtensions.swift diff --git a/KissMeConsole/KissMeConsole/KissConsole.swift b/KissMeConsole/Sources/KissConsole.swift similarity index 100% rename from KissMeConsole/KissMeConsole/KissConsole.swift rename to KissMeConsole/Sources/KissConsole.swift diff --git a/KissMeConsole/KissMeConsole/main.swift b/KissMeConsole/Sources/main.swift similarity index 100% rename from KissMeConsole/KissMeConsole/main.swift rename to KissMeConsole/Sources/main.swift diff --git a/KissMeConsole/KissMeConsole/test.swift b/KissMeConsole/Sources/test.swift similarity index 100% rename from KissMeConsole/KissMeConsole/test.swift rename to KissMeConsole/Sources/test.swift