Skip to content

Commit 67558c2

Browse files
alextudalextud
authored
Merge pull request #3 from bofualex/auto-init
Auto init
2 parents ae5e77f + 3d5a3cb commit 67558c2

File tree

5 files changed

+74
-23
lines changed

5 files changed

+74
-23
lines changed

‎netfox.xcodeproj/project.pbxproj‎

Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
17CAEF312106422000F3F22F /* NSURLSessionConfiguration+NFX.h in Headers */ = {isa = PBXBuildFile; fileRef = 17CAEF2F2106422000F3F22F /* NSURLSessionConfiguration+NFX.h */; };
11+
17CAEF322106422000F3F22F /* NSURLSessionConfiguration+NFX.m in Sources */ = {isa = PBXBuildFile; fileRef = 17CAEF302106422000F3F22F /* NSURLSessionConfiguration+NFX.m */; };
12+
17CAEF352106457F00F3F22F /* NSURLSessionConfiguration+NFX.m in Sources */ = {isa = PBXBuildFile; fileRef = 17CAEF302106422000F3F22F /* NSURLSessionConfiguration+NFX.m */; };
13+
17CAEF362106459500F3F22F /* NSURLSessionConfiguration+NFX.h in Headers */ = {isa = PBXBuildFile; fileRef = 17CAEF2F2106422000F3F22F /* NSURLSessionConfiguration+NFX.h */; };
1014
234DBCD61FA33BD90086CB79 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 234DBCD51FA33BD90086CB79 /* AppDelegate.swift */; };
1115
234DBCD81FA33BD90086CB79 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 234DBCD71FA33BD90086CB79 /* Assets.xcassets */; };
1216
234DBCDB1FA33BD90086CB79 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 234DBCD91FA33BD90086CB79 /* MainMenu.xib */; };
@@ -28,6 +32,9 @@
2832
8229AD6F1F8FB34300A9D613 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8229AD6D1F8FB34300A9D613 /* LaunchScreen.storyboard */; };
2933
8229AD771F8FB4B500A9D613 /* netfox_ios.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3BC020F1C09CDA000C17F3A /* netfox_ios.framework */; };
3034
826C4E9E1F979AB3008B440C /* NFXLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 826C4E9C1F979AB3008B440C /* NFXLoader.h */; };
35+
826C4E9F1F979AB3008B440C /* NFXLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 826C4E9D1F979AB3008B440C /* NFXLoader.m */; };
36+
82F6E1031F8FD81C002B31BD /* TextViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82F6E1021F8FD81C002B31BD /* TextViewController.swift */; };
37+
82F6E1051F8FF55D002B31BD /* WebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82F6E1041F8FF55D002B31BD /* WebViewController.swift */; };
3138
8F98A4DE202992FE007B2BB1 /* NFXPathNodeListCell_OSX.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F98A4D9202992A2007B2BB1 /* NFXPathNodeListCell_OSX.swift */; };
3239
8F98A4E12029944D007B2BB1 /* NFXPathNodeListCell_OSX.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8F98A4DF20299399007B2BB1 /* NFXPathNodeListCell_OSX.xib */; };
3340
8F98A4E3202994CB007B2BB1 /* NFXPathNodeListController_OSX.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F98A4E2202994CB007B2BB1 /* NFXPathNodeListController_OSX.swift */; };
@@ -39,9 +46,6 @@
3946
8FBC1A8E2028AF2A00ABDF22 /* NFXPathNodeManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FBC1A8A2028ACEB00ABDF22 /* NFXPathNodeManager.swift */; };
4047
8FD42BA62028A2D20084211A /* NFXPathNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FD42BA52028A2D20084211A /* NFXPathNode.swift */; };
4148
8FD42BA72028A3BB0084211A /* NFXPathNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FD42BA52028A2D20084211A /* NFXPathNode.swift */; };
42-
826C4E9F1F979AB3008B440C /* NFXLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 826C4E9D1F979AB3008B440C /* NFXLoader.m */; };
43-
82F6E1031F8FD81C002B31BD /* TextViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82F6E1021F8FD81C002B31BD /* TextViewController.swift */; };
44-
82F6E1051F8FF55D002B31BD /* WebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82F6E1041F8FF55D002B31BD /* WebViewController.swift */; };
4549
B3F8BA821C833ABC00F9FBEA /* NFX.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3F8BA711C833ABC00F9FBEA /* NFX.swift */; };
4650
B3F8BA831C833ABC00F9FBEA /* NFX.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3F8BA711C833ABC00F9FBEA /* NFX.swift */; };
4751
B3F8BA841C833ABC00F9FBEA /* NFXAssets.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3F8BA721C833ABC00F9FBEA /* NFXAssets.swift */; };
@@ -127,6 +131,8 @@
127131
/* End PBXCopyFilesBuildPhase section */
128132

129133
/* Begin PBXFileReference section */
134+
17CAEF2F2106422000F3F22F /* NSURLSessionConfiguration+NFX.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSURLSessionConfiguration+NFX.h"; sourceTree = "<group>"; };
135+
17CAEF302106422000F3F22F /* NSURLSessionConfiguration+NFX.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSURLSessionConfiguration+NFX.m"; sourceTree = "<group>"; };
130136
234DBCD31FA33BD90086CB79 /* netfox_mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = netfox_mac.app; sourceTree = BUILT_PRODUCTS_DIR; };
131137
234DBCD51FA33BD90086CB79 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
132138
234DBCD71FA33BD90086CB79 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -144,6 +150,10 @@
144150
8229AD6B1F8FB34300A9D613 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
145151
8229AD6E1F8FB34300A9D613 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
146152
8229AD701F8FB34300A9D613 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
153+
826C4E9C1F979AB3008B440C /* NFXLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFXLoader.h; sourceTree = "<group>"; };
154+
826C4E9D1F979AB3008B440C /* NFXLoader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NFXLoader.m; sourceTree = "<group>"; };
155+
82F6E1021F8FD81C002B31BD /* TextViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextViewController.swift; sourceTree = "<group>"; };
156+
82F6E1041F8FF55D002B31BD /* WebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewController.swift; sourceTree = "<group>"; };
147157
8F98A4D9202992A2007B2BB1 /* NFXPathNodeListCell_OSX.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NFXPathNodeListCell_OSX.swift; sourceTree = "<group>"; };
148158
8F98A4DF20299399007B2BB1 /* NFXPathNodeListCell_OSX.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NFXPathNodeListCell_OSX.xib; sourceTree = "<group>"; };
149159
8F98A4E2202994CB007B2BB1 /* NFXPathNodeListController_OSX.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NFXPathNodeListController_OSX.swift; sourceTree = "<group>"; };
@@ -153,10 +163,6 @@
153163
8FBC1A8A2028ACEB00ABDF22 /* NFXPathNodeManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NFXPathNodeManager.swift; sourceTree = "<group>"; };
154164
8FBFFB4C20331DD000DF9319 /* NFXJson2Codable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NFXJson2Codable.swift; sourceTree = "<group>"; };
155165
8FD42BA52028A2D20084211A /* NFXPathNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NFXPathNode.swift; sourceTree = "<group>"; };
156-
826C4E9C1F979AB3008B440C /* NFXLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFXLoader.h; sourceTree = "<group>"; };
157-
826C4E9D1F979AB3008B440C /* NFXLoader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NFXLoader.m; sourceTree = "<group>"; };
158-
82F6E1021F8FD81C002B31BD /* TextViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextViewController.swift; sourceTree = "<group>"; };
159-
82F6E1041F8FF55D002B31BD /* WebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewController.swift; sourceTree = "<group>"; };
160166
B3BC020F1C09CDA000C17F3A /* netfox_ios.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = netfox_ios.framework; sourceTree = BUILT_PRODUCTS_DIR; };
161167
B3F8BA711C833ABC00F9FBEA /* NFX.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NFX.swift; sourceTree = "<group>"; };
162168
B3F8BA721C833ABC00F9FBEA /* NFXAssets.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NFXAssets.swift; sourceTree = "<group>"; };
@@ -241,17 +247,6 @@
241247
path = netfox_mac;
242248
sourceTree = "<group>";
243249
};
244-
8F9DEE92203338F700E76B7E /* Json2Codable */ = {
245-
isa = PBXGroup;
246-
children = (
247-
8F9DEE952033393800E76B7E /* NFXCodableClass.swift */,
248-
8FBFFB4C20331DD000DF9319 /* NFXJson2Codable.swift */,
249-
8F9DEE932033391800E76B7E /* NFXJsonParser.swift */,
250-
8F9DEE972033398500E76B7E /* String+CamelCase.swift */,
251-
);
252-
path = Json2Codable;
253-
sourceTree = "<group>";
254-
};
255250
8229AD631F8FB34300A9D613 /* netfox_ios_demo */ = {
256251
isa = PBXGroup;
257252
children = (
@@ -274,6 +269,17 @@
274269
name = Frameworks;
275270
sourceTree = "<group>";
276271
};
272+
8F9DEE92203338F700E76B7E /* Json2Codable */ = {
273+
isa = PBXGroup;
274+
children = (
275+
8F9DEE952033393800E76B7E /* NFXCodableClass.swift */,
276+
8FBFFB4C20331DD000DF9319 /* NFXJson2Codable.swift */,
277+
8F9DEE932033391800E76B7E /* NFXJsonParser.swift */,
278+
8F9DEE972033398500E76B7E /* String+CamelCase.swift */,
279+
);
280+
path = Json2Codable;
281+
sourceTree = "<group>";
282+
};
277283
B3BC02051C09CDA000C17F3A = {
278284
isa = PBXGroup;
279285
children = (
@@ -325,6 +331,8 @@
325331
8FBC1A8A2028ACEB00ABDF22 /* NFXPathNodeManager.swift */,
326332
8F9DEE92203338F700E76B7E /* Json2Codable */,
327333
B3F8BA811C833ABC00F9FBEA /* NFXWindowController.swift */,
334+
17CAEF2F2106422000F3F22F /* NSURLSessionConfiguration+NFX.h */,
335+
17CAEF302106422000F3F22F /* NSURLSessionConfiguration+NFX.m */,
328336
);
329337
path = Core;
330338
sourceTree = "<group>";
@@ -380,6 +388,7 @@
380388
isa = PBXHeadersBuildPhase;
381389
buildActionMask = 2147483647;
382390
files = (
391+
17CAEF312106422000F3F22F /* NSURLSessionConfiguration+NFX.h in Headers */,
383392
826C4E9E1F979AB3008B440C /* NFXLoader.h in Headers */,
384393
);
385394
runOnlyForDeploymentPostprocessing = 0;
@@ -388,6 +397,7 @@
388397
isa = PBXHeadersBuildPhase;
389398
buildActionMask = 2147483647;
390399
files = (
400+
17CAEF362106459500F3F22F /* NSURLSessionConfiguration+NFX.h in Headers */,
391401
);
392402
runOnlyForDeploymentPostprocessing = 0;
393403
};
@@ -581,6 +591,7 @@
581591
buildActionMask = 2147483647;
582592
files = (
583593
B3F8BA821C833ABC00F9FBEA /* NFX.swift in Sources */,
594+
17CAEF322106422000F3F22F /* NSURLSessionConfiguration+NFX.m in Sources */,
584595
8FD42BA62028A2D20084211A /* NFXPathNode.swift in Sources */,
585596
B3F8BA8A1C833ABC00F9FBEA /* NFXGenericBodyDetailsController.swift in Sources */,
586597
B3F8BA901C833ABC00F9FBEA /* NFXHTTPModel.swift in Sources */,
@@ -631,6 +642,7 @@
631642
B3F8D67C1C833B1700F9FBEA /* NFXDetailsController_OSX.swift in Sources */,
632643
B3F8BA8F1C833ABC00F9FBEA /* NFXHelper.swift in Sources */,
633644
B3F8BA871C833ABC00F9FBEA /* NFXConstants.swift in Sources */,
645+
17CAEF352106457F00F3F22F /* NSURLSessionConfiguration+NFX.m in Sources */,
634646
8F98A4E3202994CB007B2BB1 /* NFXPathNodeListController_OSX.swift in Sources */,
635647
8F9DEE962033393800E76B7E /* NFXCodableClass.swift in Sources */,
636648
B3F8BA9B1C833ABC00F9FBEA /* NFXProtocol.swift in Sources */,
@@ -810,6 +822,7 @@
810822
B3BC02151C09CDA000C17F3A /* Debug */ = {
811823
isa = XCBuildConfiguration;
812824
buildSettings = {
825+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
813826
ALWAYS_SEARCH_USER_PATHS = NO;
814827
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
815828
CLANG_CXX_LIBRARY = "libc++";
@@ -836,6 +849,7 @@
836849
COPY_PHASE_STRIP = NO;
837850
CURRENT_PROJECT_VERSION = 1;
838851
DEBUG_INFORMATION_FORMAT = dwarf;
852+
DEFINES_MODULE = YES;
839853
ENABLE_STRICT_OBJC_MSGSEND = YES;
840854
ENABLE_TESTABILITY = YES;
841855
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -866,6 +880,7 @@
866880
B3BC02161C09CDA000C17F3A /* Release */ = {
867881
isa = XCBuildConfiguration;
868882
buildSettings = {
883+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
869884
ALWAYS_SEARCH_USER_PATHS = NO;
870885
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
871886
CLANG_CXX_LIBRARY = "libc++";
@@ -892,6 +907,7 @@
892907
COPY_PHASE_STRIP = NO;
893908
CURRENT_PROJECT_VERSION = 1;
894909
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
910+
DEFINES_MODULE = YES;
895911
ENABLE_NS_ASSERTIONS = NO;
896912
ENABLE_STRICT_OBJC_MSGSEND = YES;
897913
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -916,6 +932,7 @@
916932
B3BC02181C09CDA000C17F3A /* Debug */ = {
917933
isa = XCBuildConfiguration;
918934
buildSettings = {
935+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
919936
CLANG_ENABLE_MODULES = YES;
920937
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
921938
DEFINES_MODULE = YES;
@@ -937,6 +954,7 @@
937954
B3BC02191C09CDA000C17F3A /* Release */ = {
938955
isa = XCBuildConfiguration;
939956
buildSettings = {
957+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
940958
CLANG_ENABLE_MODULES = YES;
941959
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
942960
DEFINES_MODULE = YES;
@@ -947,7 +965,6 @@
947965
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
948966
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
949967
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
950-
PRODUCT_BUNDLE_IDENTIFIER = "com.kasketis.netfox-iOS";
951968
PRODUCT_NAME = "$(TARGET_NAME)";
952969
SKIP_INSTALL = YES;
953970
SWIFT_VERSION = 4.0;
@@ -957,6 +974,7 @@
957974
E20FD2EE1C6912D400DCFF61 /* Debug */ = {
958975
isa = XCBuildConfiguration;
959976
buildSettings = {
977+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
960978
CLANG_ENABLE_MODULES = YES;
961979
CODE_SIGN_IDENTITY = "-";
962980
COMBINE_HIDPI_IMAGES = YES;
@@ -986,6 +1004,7 @@
9861004
E20FD2EF1C6912D400DCFF61 /* Release */ = {
9871005
isa = XCBuildConfiguration;
9881006
buildSettings = {
1007+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
9891008
CLANG_ENABLE_MODULES = YES;
9901009
CODE_SIGN_IDENTITY = "-";
9911010
COMBINE_HIDPI_IMAGES = YES;

‎netfox/Core/NFXClientConnection.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ extension NFX {
172172
}
173173

174174
if let jsonModels = json as? [[String: Any]] {
175-
let models: [NFXHTTPModel] = jsonModels.flatMap({
175+
let models: [NFXHTTPModel] = jsonModels.compactMap({
176176
let model = NFXHTTPModel()
177177
model.fromJSON(json: $0)
178178
return model

‎netfox/Core/NSURLSessionConfiguration+NFX.h‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
//
2+
// NSURLSessionConfiguration+NFX.h
3+
// netfox_ios
4+
//
5+
// Created by Alex Bofu on 23/07/2018.
6+
// Copyright © 2018 kasketis. All rights reserved.
7+
//
8+
9+
#import <Foundation/Foundation.h>
10+
11+
NS_ASSUME_NONNULL_BEGIN
12+
13+
@interface NSURLSessionConfiguration (NFX)
14+
15+
@end
16+
17+
NS_ASSUME_NONNULL_END

‎netfox/Core/NSURLSessionConfiguration+NFX.m‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//
2+
// NSURLSessionConfiguration+NFX.m
3+
// netfox_ios
4+
//
5+
// Created by Alex Bofu on 23/07/2018.
6+
// Copyright © 2018 kasketis. All rights reserved.
7+
//
8+
9+
#import "NSURLSessionConfiguration+NFX.h"
10+
#import <netfox/netfox-Swift.h>
11+
12+
@implementation NSURLSessionConfiguration (NFX)
13+
14+
+ (void)load {
15+
[[NFX sharedInstance] start];
16+
}
17+
18+
@end

‎netfox_ios_demo/AppDelegate.swift‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//
88

99
import UIKit
10-
import netfox_ios
1110

1211
@UIApplicationMain
1312
class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -18,8 +17,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1817
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
1918
// Override point for customization after application launch.
2019

21-
NFX.sharedInstance().start()
22-
2320
return true
2421
}
2522

0 commit comments

Comments
 (0)