Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/build_app_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
- name: Setup Xcode
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '16.4'
xcode-version: latest-stable

- name: Create xcconfig files
run: |
# Debug.xcconfig 생성
Expand All @@ -41,5 +41,5 @@ jobs:
-scheme "$SCHEME" \
-configuration Debug \
-skipMacroValidation \
-destination "platform=iOS Simulator,name=iPhone 16 Pro,OS=18.4" \
-destination "platform=iOS Simulator,name=iPhone 16 Pro,OS=26.2" \
clean build
8 changes: 8 additions & 0 deletions 3rdParty/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.DS_Store
/.build
/Packages
xcuserdata/
DerivedData/
.swiftpm/configuration/registries.json
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
.netrc
48 changes: 48 additions & 0 deletions 3rdParty/Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
// swift-tools-version: 6.2
// The swift-tools-version declares the minimum version of Swift required to build this package.

import PackageDescription

let package = Package(
name: "3rdParty",
platforms: [
.iOS(.v18)
],
products: [
.library(
name: "PFDependencies",
targets: ["PFDependencies"]
),
.library(
name: "TCAProduct",
targets: ["TCAProduct"]
),
],
dependencies: [
.package(
url: "https://github.com/pointfreeco/swift-composable-architecture.git",
from: "1.22.2"
),
.package(
url: "https://github.com/pointfreeco/swift-dependencies.git",
from: "1.10.0"
),
],
targets: [
.target(
name: "TCAProduct",
dependencies: [
.product(
name: "ComposableArchitecture",
package: "swift-composable-architecture"
)
]
),
.target(
name: "PFDependencies",
dependencies: [
.product(name: "Dependencies", package: "swift-dependencies"),
]
)
]
)
8 changes: 8 additions & 0 deletions 3rdParty/Sources/PFDependencies/PFDependencies.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//
// Dependencies.swift
// 3rdParty
//
// Created by 강동영 on 1/22/26.
//

import Foundation
2 changes: 2 additions & 0 deletions 3rdParty/Sources/TCAProduct/TCAProduct.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// The Swift Programming Language
// https://docs.swift.org/swift-book
34 changes: 16 additions & 18 deletions Gusto-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
0A245D7C2EBE0600009215F7 /* GustoNetwork in Frameworks */ = {isa = PBXBuildFile; productRef = 0A245D7B2EBE0600009215F7 /* GustoNetwork */; };
0A245D7E2EBE0834009215F7 /* GustoDesign in Frameworks */ = {isa = PBXBuildFile; productRef = 0A245D7D2EBE0834009215F7 /* GustoDesign */; };
0A8BE9422E744E5500FFFDC5 /* .gitignore in Resources */ = {isa = PBXBuildFile; fileRef = 0A8BE9412E744E5000FFFDC5 /* .gitignore */; };
0A8BE94B2E7921FF00FFFDC5 /* ComposableArchitecture in Frameworks */ = {isa = PBXBuildFile; productRef = 0A8BE94A2E7921FF00FFFDC5 /* ComposableArchitecture */; };
0A8BE9622E79558200FFFDC5 /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 0A8BE9612E79558200FFFDC5 /* Debug.xcconfig */; };
B5C7D2A42F221FF700C20E14 /* TCAProduct in Frameworks */ = {isa = PBXBuildFile; productRef = B5C7D2A32F221FF700C20E14 /* TCAProduct */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -41,6 +41,7 @@
0A8BE9412E744E5000FFFDC5 /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
0A8BE9472E744F8E00FFFDC5 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
0A8BE9612E79558200FFFDC5 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
B5C7D2A12F22135F00C20E14 /* 3rdParty */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = 3rdParty; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
Expand Down Expand Up @@ -90,8 +91,8 @@
buildActionMask = 2147483647;
files = (
0A245D7E2EBE0834009215F7 /* GustoDesign in Frameworks */,
0A8BE94B2E7921FF00FFFDC5 /* ComposableArchitecture in Frameworks */,
0A245D7C2EBE0600009215F7 /* GustoNetwork in Frameworks */,
B5C7D2A42F221FF700C20E14 /* TCAProduct in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -115,6 +116,7 @@
0A8BE8F12E744D0000FFFDC5 = {
isa = PBXGroup;
children = (
B5C7D2A12F22135F00C20E14 /* 3rdParty */,
0A305F4C2EC9BE0400178814 /* DesignSystem */,
0A24E9662EB109B2006868C0 /* GustoCore */,
0A24E9672EB109B2006868C0 /* GustoNetwork */,
Expand All @@ -124,6 +126,7 @@
0A8BE8FC2E744D0000FFFDC5 /* Gusto-iOS */,
0A8BE90A2E744D0200FFFDC5 /* Gusto-iOSTests */,
0A8BE9142E744D0200FFFDC5 /* Gusto-iOSUITests */,
B5C7D2A22F221FF700C20E14 /* Frameworks */,
0A8BE8FB2E744D0000FFFDC5 /* Products */,
);
sourceTree = "<group>";
Expand All @@ -138,6 +141,13 @@
name = Products;
sourceTree = "<group>";
};
B5C7D2A22F221FF700C20E14 /* Frameworks */ = {
isa = PBXGroup;
children = (
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand All @@ -158,9 +168,9 @@
);
name = "Gusto-iOS";
packageProductDependencies = (
0A8BE94A2E7921FF00FFFDC5 /* ComposableArchitecture */,
0A245D7B2EBE0600009215F7 /* GustoNetwork */,
0A245D7D2EBE0834009215F7 /* GustoDesign */,
B5C7D2A32F221FF700C20E14 /* TCAProduct */,
);
productName = "Gusto-iOS";
productReference = 0A8BE8FA2E744D0000FFFDC5 /* Gusto-iOS.app */;
Expand Down Expand Up @@ -248,7 +258,6 @@
mainGroup = 0A8BE8F12E744D0000FFFDC5;
minimizedProjectReferenceProxies = 1;
packageReferences = (
0A8BE9492E7921FF00FFFDC5 /* XCRemoteSwiftPackageReference "swift-composable-architecture" */,
);
preferredProjectObjectVersion = 77;
productRefGroup = 0A8BE8FB2E744D0000FFFDC5 /* Products */;
Expand Down Expand Up @@ -655,17 +664,6 @@
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
0A8BE9492E7921FF00FFFDC5 /* XCRemoteSwiftPackageReference "swift-composable-architecture" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pointfreeco/swift-composable-architecture.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.22.2;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
0A245D7B2EBE0600009215F7 /* GustoNetwork */ = {
isa = XCSwiftPackageProductDependency;
Expand All @@ -675,10 +673,10 @@
isa = XCSwiftPackageProductDependency;
productName = GustoDesign;
};
0A8BE94A2E7921FF00FFFDC5 /* ComposableArchitecture */ = {
isa = XCSwiftPackageProductDependency;
package = 0A8BE9492E7921FF00FFFDC5 /* XCRemoteSwiftPackageReference "swift-composable-architecture" */;
productName = ComposableArchitecture;
B5C7D2A32F221FF700C20E14 /* TCAProduct */ = {
isa = XCSwiftPackageProductDependency;
productName = TCAProduct;
};
/* End XCSwiftPackageProductDependency section */
};
Expand Down
9 changes: 5 additions & 4 deletions GustoCore/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import PackageDescription
let package = Package(
name: "gusto-ios-core",
platforms: [
.iOS(.v14)
.iOS(.v18)
],
products: [
.library(
Expand All @@ -14,14 +14,15 @@ let package = Package(
)
],
dependencies: [
.package(url: "https://github.com/pointfreeco/swift-dependencies.git", from: "1.10.0"),
.package(name: "3rdParty", path: "../3rdParty"),
],
targets: [
.target(
name: "GustoLogger",
dependencies: [
.product(name: "Dependencies", package: "swift-dependencies"),
]
.product(name: "PFDependencies", package: "3rdParty"),
],
path: "Sources/Core/GustoLogger"
),

]
Expand Down
12 changes: 9 additions & 3 deletions GustoNetwork/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,24 @@ import PackageDescription
let package = Package(
name: "gusto-ios-network",
platforms: [
.iOS(.v16)
.iOS(.v18)
],
products: [
.library(
name: "GustoNetwork",
targets: ["GustoNetwork"]
),
],
dependencies: [
.package(name: "3rdParty", path: "../3rdParty"),
],
targets: [
.target(
name: "GustoNetwork"
name: "GustoNetwork",
dependencies: [
.product(name: "PFDependencies", package: "3rdParty"),
],
path: "Sources/Network"
),

]
)