Skip to content
This repository was archived by the owner on Sep 30, 2020. It is now read-only.

Commit 320c800

Browse files
author
Shinichiro Oba
committed
Merge pull request #3 from bricklife/use-workspace
use workspace
2 parents 614f97b + c34e20c commit 320c800

File tree

14 files changed

+422
-243
lines changed

14 files changed

+422
-243
lines changed

‎Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "Alamofire/Alamofire" "3.3.0"
1+
github "Alamofire/Alamofire" "3.4.0"
22
github "antitypical/Result" "2.0.0"

‎Carthage/Checkouts/Alamofire

Submodule Alamofire updated 50 files

‎Example/Example.xcodeproj/project.pbxproj

Lines changed: 343 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,343 @@
1+
// !$*UTF8*$!
2+
{
3+
archiveVersion = 1;
4+
classes = {
5+
};
6+
objectVersion = 46;
7+
objects = {
8+
9+
/* Begin PBXBuildFile section */
10+
CB63E2471CE2309100E22B5C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB63E2461CE2309100E22B5C /* AppDelegate.swift */; };
11+
CB63E24C1CE2309100E22B5C /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CB63E24A1CE2309100E22B5C /* Main.storyboard */; };
12+
CB63E24E1CE2309100E22B5C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CB63E24D1CE2309100E22B5C /* Assets.xcassets */; };
13+
CB63E2511CE2309100E22B5C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CB63E24F1CE2309100E22B5C /* LaunchScreen.storyboard */; };
14+
CB63E25B1CE230E300E22B5C /* SingleRequestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB63E2581CE230E300E22B5C /* SingleRequestViewController.swift */; };
15+
CB63E25C1CE230E300E22B5C /* MathService.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB63E2591CE230E300E22B5C /* MathService.swift */; };
16+
CB63E25D1CE230E300E22B5C /* BatchRequestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB63E25A1CE230E300E22B5C /* BatchRequestViewController.swift */; };
17+
CB63E2661CE231FB00E22B5C /* JSONRPCKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB63E2651CE231FB00E22B5C /* JSONRPCKit.framework */; };
18+
CB63E2671CE231FB00E22B5C /* JSONRPCKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CB63E2651CE231FB00E22B5C /* JSONRPCKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
19+
CB63E2691CE2323C00E22B5C /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB63E2681CE2323C00E22B5C /* Result.framework */; };
20+
CB63E26A1CE2323C00E22B5C /* Result.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CB63E2681CE2323C00E22B5C /* Result.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
21+
CB63E26C1CE2326200E22B5C /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB63E26B1CE2326200E22B5C /* Alamofire.framework */; };
22+
CB63E26D1CE2326200E22B5C /* Alamofire.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CB63E26B1CE2326200E22B5C /* Alamofire.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
23+
/* End PBXBuildFile section */
24+
25+
/* Begin PBXCopyFilesBuildPhase section */
26+
CB63E2641CE2317900E22B5C /* Embed Frameworks */ = {
27+
isa = PBXCopyFilesBuildPhase;
28+
buildActionMask = 2147483647;
29+
dstPath = "";
30+
dstSubfolderSpec = 10;
31+
files = (
32+
CB63E2671CE231FB00E22B5C /* JSONRPCKit.framework in Embed Frameworks */,
33+
CB63E26D1CE2326200E22B5C /* Alamofire.framework in Embed Frameworks */,
34+
CB63E26A1CE2323C00E22B5C /* Result.framework in Embed Frameworks */,
35+
);
36+
name = "Embed Frameworks";
37+
runOnlyForDeploymentPostprocessing = 0;
38+
};
39+
/* End PBXCopyFilesBuildPhase section */
40+
41+
/* Begin PBXFileReference section */
42+
CB63E2431CE2309100E22B5C /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
43+
CB63E2461CE2309100E22B5C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
44+
CB63E24B1CE2309100E22B5C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
45+
CB63E24D1CE2309100E22B5C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
46+
CB63E2501CE2309100E22B5C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
47+
CB63E2521CE2309100E22B5C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
48+
CB63E2581CE230E300E22B5C /* SingleRequestViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SingleRequestViewController.swift; sourceTree = "<group>"; };
49+
CB63E2591CE230E300E22B5C /* MathService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MathService.swift; sourceTree = "<group>"; };
50+
CB63E25A1CE230E300E22B5C /* BatchRequestViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BatchRequestViewController.swift; sourceTree = "<group>"; };
51+
CB63E2651CE231FB00E22B5C /* JSONRPCKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = JSONRPCKit.framework; path = "/Users/ooba/Library/Developer/Xcode/DerivedData/JSONRPCKit-eyjczmxjmkkuomguooskjadkjyrr/Build/Products/Debug-iphonesimulator/JSONRPCKit.framework"; sourceTree = "<absolute>"; };
52+
CB63E2681CE2323C00E22B5C /* Result.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = Result.framework; path = "/Users/ooba/Library/Developer/Xcode/DerivedData/JSONRPCKit-eyjczmxjmkkuomguooskjadkjyrr/Build/Products/Debug-iphonesimulator/Result.framework"; sourceTree = "<absolute>"; };
53+
CB63E26B1CE2326200E22B5C /* Alamofire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = Alamofire.framework; path = "/Users/ooba/Library/Developer/Xcode/DerivedData/JSONRPCKit-eyjczmxjmkkuomguooskjadkjyrr/Build/Products/Debug-iphoneos/Alamofire.framework"; sourceTree = "<absolute>"; };
54+
/* End PBXFileReference section */
55+
56+
/* Begin PBXFrameworksBuildPhase section */
57+
CB63E2401CE2309100E22B5C /* Frameworks */ = {
58+
isa = PBXFrameworksBuildPhase;
59+
buildActionMask = 2147483647;
60+
files = (
61+
CB63E2661CE231FB00E22B5C /* JSONRPCKit.framework in Frameworks */,
62+
CB63E26C1CE2326200E22B5C /* Alamofire.framework in Frameworks */,
63+
CB63E2691CE2323C00E22B5C /* Result.framework in Frameworks */,
64+
);
65+
runOnlyForDeploymentPostprocessing = 0;
66+
};
67+
/* End PBXFrameworksBuildPhase section */
68+
69+
/* Begin PBXGroup section */
70+
CB63E23A1CE2309100E22B5C = {
71+
isa = PBXGroup;
72+
children = (
73+
CB63E2451CE2309100E22B5C /* Example */,
74+
CB63E2441CE2309100E22B5C /* Products */,
75+
CB63E26E1CE232C700E22B5C /* Frameworks */,
76+
);
77+
sourceTree = "<group>";
78+
};
79+
CB63E2441CE2309100E22B5C /* Products */ = {
80+
isa = PBXGroup;
81+
children = (
82+
CB63E2431CE2309100E22B5C /* Example.app */,
83+
);
84+
name = Products;
85+
sourceTree = "<group>";
86+
};
87+
CB63E2451CE2309100E22B5C /* Example */ = {
88+
isa = PBXGroup;
89+
children = (
90+
CB63E2461CE2309100E22B5C /* AppDelegate.swift */,
91+
CB63E24D1CE2309100E22B5C /* Assets.xcassets */,
92+
CB63E25A1CE230E300E22B5C /* BatchRequestViewController.swift */,
93+
CB63E2521CE2309100E22B5C /* Info.plist */,
94+
CB63E24F1CE2309100E22B5C /* LaunchScreen.storyboard */,
95+
CB63E24A1CE2309100E22B5C /* Main.storyboard */,
96+
CB63E2591CE230E300E22B5C /* MathService.swift */,
97+
CB63E2581CE230E300E22B5C /* SingleRequestViewController.swift */,
98+
);
99+
path = Example;
100+
sourceTree = "<group>";
101+
};
102+
CB63E26E1CE232C700E22B5C /* Frameworks */ = {
103+
isa = PBXGroup;
104+
children = (
105+
CB63E26B1CE2326200E22B5C /* Alamofire.framework */,
106+
CB63E2651CE231FB00E22B5C /* JSONRPCKit.framework */,
107+
CB63E2681CE2323C00E22B5C /* Result.framework */,
108+
);
109+
name = Frameworks;
110+
sourceTree = "<group>";
111+
};
112+
/* End PBXGroup section */
113+
114+
/* Begin PBXNativeTarget section */
115+
CB63E2421CE2309100E22B5C /* Example */ = {
116+
isa = PBXNativeTarget;
117+
buildConfigurationList = CB63E2551CE2309100E22B5C /* Build configuration list for PBXNativeTarget "Example" */;
118+
buildPhases = (
119+
CB63E23F1CE2309100E22B5C /* Sources */,
120+
CB63E2401CE2309100E22B5C /* Frameworks */,
121+
CB63E2411CE2309100E22B5C /* Resources */,
122+
CB63E2641CE2317900E22B5C /* Embed Frameworks */,
123+
);
124+
buildRules = (
125+
);
126+
dependencies = (
127+
);
128+
name = Example;
129+
productName = Example;
130+
productReference = CB63E2431CE2309100E22B5C /* Example.app */;
131+
productType = "com.apple.product-type.application";
132+
};
133+
/* End PBXNativeTarget section */
134+
135+
/* Begin PBXProject section */
136+
CB63E23B1CE2309100E22B5C /* Project object */ = {
137+
isa = PBXProject;
138+
attributes = {
139+
LastSwiftUpdateCheck = 0730;
140+
LastUpgradeCheck = 0730;
141+
ORGANIZATIONNAME = "Shinichiro Oba";
142+
TargetAttributes = {
143+
CB63E2421CE2309100E22B5C = {
144+
CreatedOnToolsVersion = 7.3.1;
145+
};
146+
};
147+
};
148+
buildConfigurationList = CB63E23E1CE2309100E22B5C /* Build configuration list for PBXProject "Example" */;
149+
compatibilityVersion = "Xcode 3.2";
150+
developmentRegion = English;
151+
hasScannedForEncodings = 0;
152+
knownRegions = (
153+
en,
154+
Base,
155+
);
156+
mainGroup = CB63E23A1CE2309100E22B5C;
157+
productRefGroup = CB63E2441CE2309100E22B5C /* Products */;
158+
projectDirPath = "";
159+
projectRoot = "";
160+
targets = (
161+
CB63E2421CE2309100E22B5C /* Example */,
162+
);
163+
};
164+
/* End PBXProject section */
165+
166+
/* Begin PBXResourcesBuildPhase section */
167+
CB63E2411CE2309100E22B5C /* Resources */ = {
168+
isa = PBXResourcesBuildPhase;
169+
buildActionMask = 2147483647;
170+
files = (
171+
CB63E2511CE2309100E22B5C /* LaunchScreen.storyboard in Resources */,
172+
CB63E24E1CE2309100E22B5C /* Assets.xcassets in Resources */,
173+
CB63E24C1CE2309100E22B5C /* Main.storyboard in Resources */,
174+
);
175+
runOnlyForDeploymentPostprocessing = 0;
176+
};
177+
/* End PBXResourcesBuildPhase section */
178+
179+
/* Begin PBXSourcesBuildPhase section */
180+
CB63E23F1CE2309100E22B5C /* Sources */ = {
181+
isa = PBXSourcesBuildPhase;
182+
buildActionMask = 2147483647;
183+
files = (
184+
CB63E25C1CE230E300E22B5C /* MathService.swift in Sources */,
185+
CB63E25B1CE230E300E22B5C /* SingleRequestViewController.swift in Sources */,
186+
CB63E25D1CE230E300E22B5C /* BatchRequestViewController.swift in Sources */,
187+
CB63E2471CE2309100E22B5C /* AppDelegate.swift in Sources */,
188+
);
189+
runOnlyForDeploymentPostprocessing = 0;
190+
};
191+
/* End PBXSourcesBuildPhase section */
192+
193+
/* Begin PBXVariantGroup section */
194+
CB63E24A1CE2309100E22B5C /* Main.storyboard */ = {
195+
isa = PBXVariantGroup;
196+
children = (
197+
CB63E24B1CE2309100E22B5C /* Base */,
198+
);
199+
name = Main.storyboard;
200+
sourceTree = "<group>";
201+
};
202+
CB63E24F1CE2309100E22B5C /* LaunchScreen.storyboard */ = {
203+
isa = PBXVariantGroup;
204+
children = (
205+
CB63E2501CE2309100E22B5C /* Base */,
206+
);
207+
name = LaunchScreen.storyboard;
208+
sourceTree = "<group>";
209+
};
210+
/* End PBXVariantGroup section */
211+
212+
/* Begin XCBuildConfiguration section */
213+
CB63E2531CE2309100E22B5C /* Debug */ = {
214+
isa = XCBuildConfiguration;
215+
buildSettings = {
216+
ALWAYS_SEARCH_USER_PATHS = NO;
217+
CLANG_ANALYZER_NONNULL = YES;
218+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
219+
CLANG_CXX_LIBRARY = "libc++";
220+
CLANG_ENABLE_MODULES = YES;
221+
CLANG_ENABLE_OBJC_ARC = YES;
222+
CLANG_WARN_BOOL_CONVERSION = YES;
223+
CLANG_WARN_CONSTANT_CONVERSION = YES;
224+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
225+
CLANG_WARN_EMPTY_BODY = YES;
226+
CLANG_WARN_ENUM_CONVERSION = YES;
227+
CLANG_WARN_INT_CONVERSION = YES;
228+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
229+
CLANG_WARN_UNREACHABLE_CODE = YES;
230+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
231+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
232+
COPY_PHASE_STRIP = NO;
233+
DEBUG_INFORMATION_FORMAT = dwarf;
234+
ENABLE_STRICT_OBJC_MSGSEND = YES;
235+
ENABLE_TESTABILITY = YES;
236+
GCC_C_LANGUAGE_STANDARD = gnu99;
237+
GCC_DYNAMIC_NO_PIC = NO;
238+
GCC_NO_COMMON_BLOCKS = YES;
239+
GCC_OPTIMIZATION_LEVEL = 0;
240+
GCC_PREPROCESSOR_DEFINITIONS = (
241+
"DEBUG=1",
242+
"$(inherited)",
243+
);
244+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
245+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
246+
GCC_WARN_UNDECLARED_SELECTOR = YES;
247+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
248+
GCC_WARN_UNUSED_FUNCTION = YES;
249+
GCC_WARN_UNUSED_VARIABLE = YES;
250+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
251+
MTL_ENABLE_DEBUG_INFO = YES;
252+
ONLY_ACTIVE_ARCH = YES;
253+
SDKROOT = iphoneos;
254+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
255+
TARGETED_DEVICE_FAMILY = "1,2";
256+
};
257+
name = Debug;
258+
};
259+
CB63E2541CE2309100E22B5C /* Release */ = {
260+
isa = XCBuildConfiguration;
261+
buildSettings = {
262+
ALWAYS_SEARCH_USER_PATHS = NO;
263+
CLANG_ANALYZER_NONNULL = YES;
264+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
265+
CLANG_CXX_LIBRARY = "libc++";
266+
CLANG_ENABLE_MODULES = YES;
267+
CLANG_ENABLE_OBJC_ARC = YES;
268+
CLANG_WARN_BOOL_CONVERSION = YES;
269+
CLANG_WARN_CONSTANT_CONVERSION = YES;
270+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
271+
CLANG_WARN_EMPTY_BODY = YES;
272+
CLANG_WARN_ENUM_CONVERSION = YES;
273+
CLANG_WARN_INT_CONVERSION = YES;
274+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
275+
CLANG_WARN_UNREACHABLE_CODE = YES;
276+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
277+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
278+
COPY_PHASE_STRIP = NO;
279+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
280+
ENABLE_NS_ASSERTIONS = NO;
281+
ENABLE_STRICT_OBJC_MSGSEND = YES;
282+
GCC_C_LANGUAGE_STANDARD = gnu99;
283+
GCC_NO_COMMON_BLOCKS = YES;
284+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
285+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
286+
GCC_WARN_UNDECLARED_SELECTOR = YES;
287+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
288+
GCC_WARN_UNUSED_FUNCTION = YES;
289+
GCC_WARN_UNUSED_VARIABLE = YES;
290+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
291+
MTL_ENABLE_DEBUG_INFO = NO;
292+
SDKROOT = iphoneos;
293+
TARGETED_DEVICE_FAMILY = "1,2";
294+
VALIDATE_PRODUCT = YES;
295+
};
296+
name = Release;
297+
};
298+
CB63E2561CE2309100E22B5C /* Debug */ = {
299+
isa = XCBuildConfiguration;
300+
buildSettings = {
301+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
302+
INFOPLIST_FILE = Example/Info.plist;
303+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
304+
PRODUCT_BUNDLE_IDENTIFIER = com.bricklife.ios.Example;
305+
PRODUCT_NAME = "$(TARGET_NAME)";
306+
};
307+
name = Debug;
308+
};
309+
CB63E2571CE2309100E22B5C /* Release */ = {
310+
isa = XCBuildConfiguration;
311+
buildSettings = {
312+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
313+
INFOPLIST_FILE = Example/Info.plist;
314+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
315+
PRODUCT_BUNDLE_IDENTIFIER = com.bricklife.ios.Example;
316+
PRODUCT_NAME = "$(TARGET_NAME)";
317+
};
318+
name = Release;
319+
};
320+
/* End XCBuildConfiguration section */
321+
322+
/* Begin XCConfigurationList section */
323+
CB63E23E1CE2309100E22B5C /* Build configuration list for PBXProject "Example" */ = {
324+
isa = XCConfigurationList;
325+
buildConfigurations = (
326+
CB63E2531CE2309100E22B5C /* Debug */,
327+
CB63E2541CE2309100E22B5C /* Release */,
328+
);
329+
defaultConfigurationIsVisible = 0;
330+
defaultConfigurationName = Release;
331+
};
332+
CB63E2551CE2309100E22B5C /* Build configuration list for PBXNativeTarget "Example" */ = {
333+
isa = XCConfigurationList;
334+
buildConfigurations = (
335+
CB63E2561CE2309100E22B5C /* Debug */,
336+
CB63E2571CE2309100E22B5C /* Release */,
337+
);
338+
defaultConfigurationIsVisible = 0;
339+
};
340+
/* End XCConfigurationList section */
341+
};
342+
rootObject = CB63E23B1CE2309100E22B5C /* Project object */;
343+
}

‎Example/AppDelegate.swift renamed to ‎Example/Example/AppDelegate.swift

File renamed without changes.

‎Example/Assets.xcassets/AppIcon.appiconset/Contents.json renamed to ‎Example/Example/Assets.xcassets/AppIcon.appiconset/Contents.json

File renamed without changes.

‎Example/Base.lproj/LaunchScreen.storyboard renamed to ‎Example/Example/Base.lproj/LaunchScreen.storyboard

File renamed without changes.

0 commit comments

Comments
 (0)