Skip to content

Commit 0cd3340

Browse files
mark77234mark77234
authored
Merge pull request #13 from ApptiveDev/dev
[Release] 1.0.3~1.0.4 업데이트
2 parents 3ab41ce + 1a3a67f commit 0cd3340

35 files changed

Lines changed: 1808 additions & 141 deletions

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ DerivedData/
1212
*.xccheckout
1313
*.xcscmblueprint
1414
*.moved-aside
15+
*.xcconfig
1516

1617
# Swift Package Manager
1718
.build/
@@ -22,3 +23,5 @@ Packages/
2223
*.profdata
2324
*.xccovreport
2425
*.xccovarchive
26+
*.xcuserdata
27+

‎KillingPart.xcodeproj/project.pbxproj‎

Lines changed: 58 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@
66
objectVersion = 77;
77
objects = {
88

9+
/* Begin PBXBuildFile section */
10+
12CE25AA2F3DC9BE0057A858 /* Development.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 12CE25A92F3DC9BE0057A858 /* Development.xcconfig */; };
11+
12CE25AC2F3DCA940057A858 /* Release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 12CE25AB2F3DCA940057A858 /* Release.xcconfig */; };
12+
12F7A0012F3F010000A00001 /* KakaoSDKCommon in Frameworks */ = {isa = PBXBuildFile; productRef = 12F7A0112F3F010000A00001 /* KakaoSDKCommon */; };
13+
12F7A0022F3F010000A00001 /* KakaoSDKAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 12F7A0122F3F010000A00001 /* KakaoSDKAuth */; };
14+
12F7A0032F3F010000A00001 /* KakaoSDKUser in Frameworks */ = {isa = PBXBuildFile; productRef = 12F7A0132F3F010000A00001 /* KakaoSDKUser */; };
15+
/* End PBXBuildFile section */
16+
917
/* Begin PBXContainerItemProxy section */
1018
1231F12E2F372E5D00CFA51D /* PBXContainerItemProxy */ = {
1119
isa = PBXContainerItemProxy;
@@ -27,6 +35,8 @@
2735
1231F11D2F372E5B00CFA51D /* KillingPart.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KillingPart.app; sourceTree = BUILT_PRODUCTS_DIR; };
2836
1231F12D2F372E5D00CFA51D /* KillingPartTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KillingPartTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
2937
1231F1372F372E5D00CFA51D /* KillingPartUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KillingPartUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
38+
12CE25A92F3DC9BE0057A858 /* Development.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = "<group>"; };
39+
12CE25AB2F3DCA940057A858 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
3040
/* End PBXFileReference section */
3141

3242
/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
@@ -65,6 +75,9 @@
6575
isa = PBXFrameworksBuildPhase;
6676
buildActionMask = 2147483647;
6777
files = (
78+
12F7A0012F3F010000A00001 /* KakaoSDKCommon in Frameworks */,
79+
12F7A0022F3F010000A00001 /* KakaoSDKAuth in Frameworks */,
80+
12F7A0032F3F010000A00001 /* KakaoSDKUser in Frameworks */,
6881
);
6982
runOnlyForDeploymentPostprocessing = 0;
7083
};
@@ -88,6 +101,8 @@
88101
1231F1142F372E5B00CFA51D = {
89102
isa = PBXGroup;
90103
children = (
104+
12CE25AB2F3DCA940057A858 /* Release.xcconfig */,
105+
12CE25A92F3DC9BE0057A858 /* Development.xcconfig */,
91106
1231F11F2F372E5B00CFA51D /* KillingPart */,
92107
1231F1302F372E5D00CFA51D /* KillingPartTests */,
93108
1231F13A2F372E5D00CFA51D /* KillingPartUITests */,
@@ -125,6 +140,9 @@
125140
);
126141
name = KillingPart;
127142
packageProductDependencies = (
143+
12F7A0112F3F010000A00001 /* KakaoSDKCommon */,
144+
12F7A0122F3F010000A00001 /* KakaoSDKAuth */,
145+
12F7A0132F3F010000A00001 /* KakaoSDKUser */,
128146
);
129147
productName = KillingPart;
130148
productReference = 1231F11D2F372E5B00CFA51D /* KillingPart.app */;
@@ -208,6 +226,9 @@
208226
);
209227
mainGroup = 1231F1142F372E5B00CFA51D;
210228
minimizedProjectReferenceProxies = 1;
229+
packageReferences = (
230+
12F7A0212F3F010000A00001 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */,
231+
);
211232
preferredProjectObjectVersion = 77;
212233
productRefGroup = 1231F11E2F372E5B00CFA51D /* Products */;
213234
projectDirPath = "";
@@ -225,6 +246,8 @@
225246
isa = PBXResourcesBuildPhase;
226247
buildActionMask = 2147483647;
227248
files = (
249+
12CE25AA2F3DC9BE0057A858 /* Development.xcconfig in Resources */,
250+
12CE25AC2F3DCA940057A858 /* Release.xcconfig in Resources */,
228251
);
229252
runOnlyForDeploymentPostprocessing = 0;
230253
};
@@ -284,6 +307,7 @@
284307
/* Begin XCBuildConfiguration section */
285308
1231F13F2F372E5D00CFA51D /* Debug */ = {
286309
isa = XCBuildConfiguration;
310+
baseConfigurationReference = 12CE25A92F3DC9BE0057A858 /* Development.xcconfig */;
287311
buildSettings = {
288312
ALWAYS_SEARCH_USER_PATHS = NO;
289313
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
@@ -348,6 +372,7 @@
348372
};
349373
1231F1402F372E5D00CFA51D /* Release */ = {
350374
isa = XCBuildConfiguration;
375+
baseConfigurationReference = 12CE25AB2F3DCA940057A858 /* Release.xcconfig */;
351376
buildSettings = {
352377
ALWAYS_SEARCH_USER_PATHS = NO;
353378
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
@@ -409,7 +434,7 @@
409434
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
410435
CODE_SIGN_ENTITLEMENTS = KillingPart/KillingPart.entitlements;
411436
CODE_SIGN_STYLE = Automatic;
412-
CURRENT_PROJECT_VERSION = 1;
437+
CURRENT_PROJECT_VERSION = 4;
413438
DEAD_CODE_STRIPPING = YES;
414439
DEVELOPMENT_TEAM = GQ89YG5G9R;
415440
ENABLE_APP_SANDBOX = YES;
@@ -434,7 +459,7 @@
434459
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
435460
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
436461
MACOSX_DEPLOYMENT_TARGET = 14.0;
437-
MARKETING_VERSION = 1.0.0;
462+
MARKETING_VERSION = 1.0.4;
438463
PRODUCT_BUNDLE_IDENTIFIER = com.killingpoint.killingpart;
439464
PRODUCT_NAME = "$(TARGET_NAME)";
440465
REGISTER_APP_GROUPS = YES;
@@ -454,7 +479,7 @@
454479
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
455480
CODE_SIGN_ENTITLEMENTS = KillingPart/KillingPart.entitlements;
456481
CODE_SIGN_STYLE = Automatic;
457-
CURRENT_PROJECT_VERSION = 1;
482+
CURRENT_PROJECT_VERSION = 4;
458483
DEAD_CODE_STRIPPING = YES;
459484
DEVELOPMENT_TEAM = GQ89YG5G9R;
460485
ENABLE_APP_SANDBOX = YES;
@@ -479,7 +504,7 @@
479504
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
480505
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
481506
MACOSX_DEPLOYMENT_TARGET = 14.0;
482-
MARKETING_VERSION = 1.0.0;
507+
MARKETING_VERSION = 1.0.4;
483508
PRODUCT_BUNDLE_IDENTIFIER = com.killingpoint.killingpart;
484509
PRODUCT_NAME = "$(TARGET_NAME)";
485510
REGISTER_APP_GROUPS = YES;
@@ -626,6 +651,35 @@
626651
defaultConfigurationName = Release;
627652
};
628653
/* End XCConfigurationList section */
654+
655+
/* Begin XCRemoteSwiftPackageReference section */
656+
12F7A0212F3F010000A00001 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */ = {
657+
isa = XCRemoteSwiftPackageReference;
658+
repositoryURL = "https://github.com/kakao/kakao-ios-sdk";
659+
requirement = {
660+
branch = master;
661+
kind = branch;
662+
};
663+
};
664+
/* End XCRemoteSwiftPackageReference section */
665+
666+
/* Begin XCSwiftPackageProductDependency section */
667+
12F7A0112F3F010000A00001 /* KakaoSDKCommon */ = {
668+
isa = XCSwiftPackageProductDependency;
669+
package = 12F7A0212F3F010000A00001 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */;
670+
productName = KakaoSDKCommon;
671+
};
672+
12F7A0122F3F010000A00001 /* KakaoSDKAuth */ = {
673+
isa = XCSwiftPackageProductDependency;
674+
package = 12F7A0212F3F010000A00001 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */;
675+
productName = KakaoSDKAuth;
676+
};
677+
12F7A0132F3F010000A00001 /* KakaoSDKUser */ = {
678+
isa = XCSwiftPackageProductDependency;
679+
package = 12F7A0212F3F010000A00001 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */;
680+
productName = KakaoSDKUser;
681+
};
682+
/* End XCSwiftPackageProductDependency section */
629683
};
630684
rootObject = 1231F1152F372E5B00CFA51D /* Project object */;
631685
}

‎KillingPart.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎KillingPart.xcodeproj/xcshareddata/xcschemes/KillingPart.xcscheme‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "2620"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES"
8+
buildArchitectures = "Automatic">
9+
<BuildActionEntries>
10+
<BuildActionEntry
11+
buildForTesting = "YES"
12+
buildForRunning = "YES"
13+
buildForProfiling = "YES"
14+
buildForArchiving = "YES"
15+
buildForAnalyzing = "YES">
16+
<BuildableReference
17+
BuildableIdentifier = "primary"
18+
BlueprintIdentifier = "1231F11C2F372E5B00CFA51D"
19+
BuildableName = "KillingPart.app"
20+
BlueprintName = "KillingPart"
21+
ReferencedContainer = "container:KillingPart.xcodeproj">
22+
</BuildableReference>
23+
</BuildActionEntry>
24+
</BuildActionEntries>
25+
</BuildAction>
26+
<TestAction
27+
buildConfiguration = "Debug"
28+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
29+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
30+
shouldUseLaunchSchemeArgsEnv = "YES"
31+
shouldAutocreateTestPlan = "YES">
32+
<Testables>
33+
<TestableReference
34+
skipped = "NO"
35+
parallelizable = "YES">
36+
<BuildableReference
37+
BuildableIdentifier = "primary"
38+
BlueprintIdentifier = "1231F12C2F372E5D00CFA51D"
39+
BuildableName = "KillingPartTests.xctest"
40+
BlueprintName = "KillingPartTests"
41+
ReferencedContainer = "container:KillingPart.xcodeproj">
42+
</BuildableReference>
43+
</TestableReference>
44+
<TestableReference
45+
skipped = "NO"
46+
parallelizable = "YES">
47+
<BuildableReference
48+
BuildableIdentifier = "primary"
49+
BlueprintIdentifier = "1231F1362F372E5D00CFA51D"
50+
BuildableName = "KillingPartUITests.xctest"
51+
BlueprintName = "KillingPartUITests"
52+
ReferencedContainer = "container:KillingPart.xcodeproj">
53+
</BuildableReference>
54+
</TestableReference>
55+
</Testables>
56+
</TestAction>
57+
<LaunchAction
58+
buildConfiguration = "Debug"
59+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
60+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
61+
launchStyle = "0"
62+
useCustomWorkingDirectory = "NO"
63+
ignoresPersistentStateOnLaunch = "NO"
64+
debugDocumentVersioning = "YES"
65+
debugServiceExtension = "internal"
66+
allowLocationSimulation = "YES">
67+
<BuildableProductRunnable
68+
runnableDebuggingMode = "0">
69+
<BuildableReference
70+
BuildableIdentifier = "primary"
71+
BlueprintIdentifier = "1231F11C2F372E5B00CFA51D"
72+
BuildableName = "KillingPart.app"
73+
BlueprintName = "KillingPart"
74+
ReferencedContainer = "container:KillingPart.xcodeproj">
75+
</BuildableReference>
76+
</BuildableProductRunnable>
77+
</LaunchAction>
78+
<ProfileAction
79+
buildConfiguration = "Release"
80+
shouldUseLaunchSchemeArgsEnv = "YES"
81+
savedToolIdentifier = ""
82+
useCustomWorkingDirectory = "NO"
83+
debugDocumentVersioning = "YES">
84+
<BuildableProductRunnable
85+
runnableDebuggingMode = "0">
86+
<BuildableReference
87+
BuildableIdentifier = "primary"
88+
BlueprintIdentifier = "1231F11C2F372E5B00CFA51D"
89+
BuildableName = "KillingPart.app"
90+
BlueprintName = "KillingPart"
91+
ReferencedContainer = "container:KillingPart.xcodeproj">
92+
</BuildableReference>
93+
</BuildableProductRunnable>
94+
</ProfileAction>
95+
<AnalyzeAction
96+
buildConfiguration = "Debug">
97+
</AnalyzeAction>
98+
<ArchiveAction
99+
buildConfiguration = "Release"
100+
revealArchiveInOrganizer = "YES">
101+
</ArchiveAction>
102+
</Scheme>

‎KillingPart/Assets.xcassets/Login/Contents.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"author" : "xcode",
4+
"version" : 1
5+
}
6+
}

‎KillingPart/Assets.xcassets/Login/kakaoTalkBubble.imageset/Contents.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "maintabIcoChats.pdf",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
},
12+
"properties" : {
13+
"template-rendering-intent" : "template"
14+
}
15+
}

‎KillingPart/Assets.xcassets/Login/kakaoTalkBubble.imageset/maintabIcoChats.pdf‎

4.21 KB
Binary file not shown.

‎KillingPart/Assets.xcassets/Login/loginTitle.imageset/Contents.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "loginTitle.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "loginTitle 1.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "loginTitle 2.png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}

‎KillingPart/Assets.xcassets/Login/loginTitle.imageset/loginTitle 1.png‎

37.3 KB
Loading

‎KillingPart/Assets.xcassets/Login/loginTitle.imageset/loginTitle 2.png‎

37.3 KB
Loading

0 commit comments

Comments
 (0)