From 80b7f98ea029c545527023e8c73b6558314e6984 Mon Sep 17 00:00:00 2001 From: opficdev <162981733+opficdev@users.noreply.github.com> Date: Wed, 3 Jun 2026 01:16:08 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20APNs=20=ED=99=98=EA=B2=BD=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/DevLogApp/DevLogApp.xcodeproj/project.pbxproj | 2 ++ Application/DevLogApp/Project.swift | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/Application/DevLogApp/DevLogApp.xcodeproj/project.pbxproj b/Application/DevLogApp/DevLogApp.xcodeproj/project.pbxproj index 4c25467e..e2dbdf8e 100644 --- a/Application/DevLogApp/DevLogApp.xcodeproj/project.pbxproj +++ b/Application/DevLogApp/DevLogApp.xcodeproj/project.pbxproj @@ -511,6 +511,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 4635BA36DE82C73A105E7157 /* Version.xcconfig */; buildSettings = { + APS_ENVIRONMENT = production; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Sources/Resource/DevLog.entitlements; @@ -619,6 +620,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 4635BA36DE82C73A105E7157 /* Version.xcconfig */; buildSettings = { + APS_ENVIRONMENT = development; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Sources/Resource/DevLog.entitlements; diff --git a/Application/DevLogApp/Project.swift b/Application/DevLogApp/Project.swift index 2e636192..8261163c 100644 --- a/Application/DevLogApp/Project.swift +++ b/Application/DevLogApp/Project.swift @@ -41,6 +41,12 @@ let project = Project( "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon", "CODE_SIGN_STYLE": "Automatic", "PRODUCT_MODULE_NAME": "DevLogApp", + ], + debug: [ + "APS_ENVIRONMENT": "development", + ], + release: [ + "APS_ENVIRONMENT": "production", ] ) ), From 06f0608b5a59ce1d5658bbe961798d6420b46cbb Mon Sep 17 00:00:00 2001 From: opficdev <162981733+opficdev@users.noreply.github.com> Date: Wed, 3 Jun 2026 01:21:24 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=EC=97=90=EC=84=9C=20=ED=85=8D=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EB=B6=80=EB=B6=84=EB=A7=8C=20=ED=83=AD=EC=9D=B4=20?= =?UTF-8?q?=EB=90=98=EB=8D=98=20=ED=98=84=EC=83=81=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/Component/LoginButton.swift | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Application/DevLogPresentation/Sources/Common/Component/LoginButton.swift b/Application/DevLogPresentation/Sources/Common/Component/LoginButton.swift index 7c9c6fe0..7f6f310a 100644 --- a/Application/DevLogPresentation/Sources/Common/Component/LoginButton.swift +++ b/Application/DevLogPresentation/Sources/Common/Component/LoginButton.swift @@ -25,27 +25,27 @@ struct LoginButton: View { } var body: some View { - Button(action: { + Button { action() - }) { + } label: { Text(text) .foregroundStyle(Color.primary) .font(.system(.body)) - } - .frame(width: 300, height: height + 16) - .contentShape(.capsule) - .overlay { - ZStack(alignment: .leading) { - Capsule() - .stroke(Color.gray, lineWidth: 1) - if let logo = logo { - logo - .resizable() - .scaledToFit() - .frame(width: height, height: height) - .padding(.leading) + .frame(width: 300, height: height + 16) + .overlay { + ZStack(alignment: .leading) { + Capsule() + .stroke(Color.gray, lineWidth: 1) + if let logo = logo { + logo + .resizable() + .scaledToFit() + .frame(width: height, height: height) + .padding(.leading) + } + } } - } } + .contentShape(.capsule) } } From 7de3670f898613a797009cb2b7d63e4250ab813f Mon Sep 17 00:00:00 2001 From: opficdev <162981733+opficdev@users.noreply.github.com> Date: Wed, 3 Jun 2026 01:34:21 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=EC=95=B1=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=B0=B8=EC=A1=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/DevLogApp/DevLogApp.xcodeproj/project.pbxproj | 6 ++++-- Application/DevLogApp/Project.swift | 2 +- Application/DevLogApp/Sources/App.xcconfig | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 Application/DevLogApp/Sources/App.xcconfig diff --git a/Application/DevLogApp/DevLogApp.xcodeproj/project.pbxproj b/Application/DevLogApp/DevLogApp.xcodeproj/project.pbxproj index e2dbdf8e..a1c923ba 100644 --- a/Application/DevLogApp/DevLogApp.xcodeproj/project.pbxproj +++ b/Application/DevLogApp/DevLogApp.xcodeproj/project.pbxproj @@ -138,6 +138,7 @@ DCC05042BEB7C047BE4DB7E9 /* DevLogWidgetCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DevLogWidgetCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; ECA33E1403AF8BDB84D46C01 /* DevLogPresentation.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DevLogPresentation.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F078E79DE65AE8D92F556B27 /* DeletePushNotificationIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeletePushNotificationIntegrationTests.swift; sourceTree = ""; }; + FA3AC9C61067B0FBDE869711 /* App.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = App.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -206,6 +207,7 @@ children = ( 6F190E03DDAFD11C50FF6510 /* App */, 514423F7A59AD057AC7310CA /* Resource */, + FA3AC9C61067B0FBDE869711 /* App.xcconfig */, ); path = Sources; sourceTree = ""; @@ -509,7 +511,7 @@ /* Begin XCBuildConfiguration section */ 31AC08F8A6DA3854B3A6B6AC /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4635BA36DE82C73A105E7157 /* Version.xcconfig */; + baseConfigurationReference = FA3AC9C61067B0FBDE869711 /* App.xcconfig */; buildSettings = { APS_ENVIRONMENT = production; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -618,7 +620,7 @@ }; 8D758741AE117AED0462B9E4 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4635BA36DE82C73A105E7157 /* Version.xcconfig */; + baseConfigurationReference = FA3AC9C61067B0FBDE869711 /* App.xcconfig */; buildSettings = { APS_ENVIRONMENT = development; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; diff --git a/Application/DevLogApp/Project.swift b/Application/DevLogApp/Project.swift index 8261163c..35f4ee59 100644 --- a/Application/DevLogApp/Project.swift +++ b/Application/DevLogApp/Project.swift @@ -36,7 +36,7 @@ let project = Project( DevLogPackages.swiftLintPlugin, ], settings: .devlog( - versionXcconfigPath: "../Shared/Version.xcconfig", + versionXcconfigPath: "Sources/App.xcconfig", base: [ "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon", "CODE_SIGN_STYLE": "Automatic", diff --git a/Application/DevLogApp/Sources/App.xcconfig b/Application/DevLogApp/Sources/App.xcconfig new file mode 100644 index 00000000..e0e8aa65 --- /dev/null +++ b/Application/DevLogApp/Sources/App.xcconfig @@ -0,0 +1,2 @@ +#include "../../Shared/Version.xcconfig" +#include? "Resource/Config.xcconfig" From efee8c282aa3e38bd5a2293a55c8ff569753ac3d Mon Sep 17 00:00:00 2001 From: opficdev <162981733+opficdev@users.noreply.github.com> Date: Wed, 3 Jun 2026 01:41:23 +0900 Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20contentShape(:)=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/Common/Component/LoginButton.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/DevLogPresentation/Sources/Common/Component/LoginButton.swift b/Application/DevLogPresentation/Sources/Common/Component/LoginButton.swift index 7f6f310a..d5e6a153 100644 --- a/Application/DevLogPresentation/Sources/Common/Component/LoginButton.swift +++ b/Application/DevLogPresentation/Sources/Common/Component/LoginButton.swift @@ -31,6 +31,7 @@ struct LoginButton: View { Text(text) .foregroundStyle(Color.primary) .font(.system(.body)) + .contentShape(.capsule) .frame(width: 300, height: height + 16) .overlay { ZStack(alignment: .leading) { @@ -46,6 +47,5 @@ struct LoginButton: View { } } } - .contentShape(.capsule) } }