Skip to content

Commit 9089968

Browse files
alextudalextud
authored
Merge pull request #4 from alextud/revert-3-auto-init
Revert "Auto init"
2 parents 67558c2 + 82d2dfb commit 9089968

File tree

5 files changed

+23
-74
lines changed

5 files changed

+23
-74
lines changed

‎netfox.xcodeproj/project.pbxproj‎

Lines changed: 19 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
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 */; };
1410
234DBCD61FA33BD90086CB79 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 234DBCD51FA33BD90086CB79 /* AppDelegate.swift */; };
1511
234DBCD81FA33BD90086CB79 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 234DBCD71FA33BD90086CB79 /* Assets.xcassets */; };
1612
234DBCDB1FA33BD90086CB79 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 234DBCD91FA33BD90086CB79 /* MainMenu.xib */; };
@@ -32,9 +28,6 @@
3228
8229AD6F1F8FB34300A9D613 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8229AD6D1F8FB34300A9D613 /* LaunchScreen.storyboard */; };
3329
8229AD771F8FB4B500A9D613 /* netfox_ios.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3BC020F1C09CDA000C17F3A /* netfox_ios.framework */; };
3430
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 */; };
3831
8F98A4DE202992FE007B2BB1 /* NFXPathNodeListCell_OSX.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F98A4D9202992A2007B2BB1 /* NFXPathNodeListCell_OSX.swift */; };
3932
8F98A4E12029944D007B2BB1 /* NFXPathNodeListCell_OSX.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8F98A4DF20299399007B2BB1 /* NFXPathNodeListCell_OSX.xib */; };
4033
8F98A4E3202994CB007B2BB1 /* NFXPathNodeListController_OSX.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F98A4E2202994CB007B2BB1 /* NFXPathNodeListController_OSX.swift */; };
@@ -46,6 +39,9 @@
4639
8FBC1A8E2028AF2A00ABDF22 /* NFXPathNodeManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FBC1A8A2028ACEB00ABDF22 /* NFXPathNodeManager.swift */; };
4740
8FD42BA62028A2D20084211A /* NFXPathNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FD42BA52028A2D20084211A /* NFXPathNode.swift */; };
4841
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 */; };
4945
B3F8BA821C833ABC00F9FBEA /* NFX.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3F8BA711C833ABC00F9FBEA /* NFX.swift */; };
5046
B3F8BA831C833ABC00F9FBEA /* NFX.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3F8BA711C833ABC00F9FBEA /* NFX.swift */; };
5147
B3F8BA841C833ABC00F9FBEA /* NFXAssets.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3F8BA721C833ABC00F9FBEA /* NFXAssets.swift */; };
@@ -131,8 +127,6 @@
131127
/* End PBXCopyFilesBuildPhase section */
132128

133129
/* 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>"; };
136130
234DBCD31FA33BD90086CB79 /* netfox_mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = netfox_mac.app; sourceTree = BUILT_PRODUCTS_DIR; };
137131
234DBCD51FA33BD90086CB79 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
138132
234DBCD71FA33BD90086CB79 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -150,10 +144,6 @@
150144
8229AD6B1F8FB34300A9D613 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
151145
8229AD6E1F8FB34300A9D613 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
152146
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>"; };
157147
8F98A4D9202992A2007B2BB1 /* NFXPathNodeListCell_OSX.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NFXPathNodeListCell_OSX.swift; sourceTree = "<group>"; };
158148
8F98A4DF20299399007B2BB1 /* NFXPathNodeListCell_OSX.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NFXPathNodeListCell_OSX.xib; sourceTree = "<group>"; };
159149
8F98A4E2202994CB007B2BB1 /* NFXPathNodeListController_OSX.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NFXPathNodeListController_OSX.swift; sourceTree = "<group>"; };
@@ -163,6 +153,10 @@
163153
8FBC1A8A2028ACEB00ABDF22 /* NFXPathNodeManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NFXPathNodeManager.swift; sourceTree = "<group>"; };
164154
8FBFFB4C20331DD000DF9319 /* NFXJson2Codable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NFXJson2Codable.swift; sourceTree = "<group>"; };
165155
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>"; };
166160
B3BC020F1C09CDA000C17F3A /* netfox_ios.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = netfox_ios.framework; sourceTree = BUILT_PRODUCTS_DIR; };
167161
B3F8BA711C833ABC00F9FBEA /* NFX.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NFX.swift; sourceTree = "<group>"; };
168162
B3F8BA721C833ABC00F9FBEA /* NFXAssets.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NFXAssets.swift; sourceTree = "<group>"; };
@@ -247,6 +241,17 @@
247241
path = netfox_mac;
248242
sourceTree = "<group>";
249243
};
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+
};
250255
8229AD631F8FB34300A9D613 /* netfox_ios_demo */ = {
251256
isa = PBXGroup;
252257
children = (
@@ -269,17 +274,6 @@
269274
name = Frameworks;
270275
sourceTree = "<group>";
271276
};
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-
};
283277
B3BC02051C09CDA000C17F3A = {
284278
isa = PBXGroup;
285279
children = (
@@ -331,8 +325,6 @@
331325
8FBC1A8A2028ACEB00ABDF22 /* NFXPathNodeManager.swift */,
332326
8F9DEE92203338F700E76B7E /* Json2Codable */,
333327
B3F8BA811C833ABC00F9FBEA /* NFXWindowController.swift */,
334-
17CAEF2F2106422000F3F22F /* NSURLSessionConfiguration+NFX.h */,
335-
17CAEF302106422000F3F22F /* NSURLSessionConfiguration+NFX.m */,
336328
);
337329
path = Core;
338330
sourceTree = "<group>";
@@ -388,7 +380,6 @@
388380
isa = PBXHeadersBuildPhase;
389381
buildActionMask = 2147483647;
390382
files = (
391-
17CAEF312106422000F3F22F /* NSURLSessionConfiguration+NFX.h in Headers */,
392383
826C4E9E1F979AB3008B440C /* NFXLoader.h in Headers */,
393384
);
394385
runOnlyForDeploymentPostprocessing = 0;
@@ -397,7 +388,6 @@
397388
isa = PBXHeadersBuildPhase;
398389
buildActionMask = 2147483647;
399390
files = (
400-
17CAEF362106459500F3F22F /* NSURLSessionConfiguration+NFX.h in Headers */,
401391
);
402392
runOnlyForDeploymentPostprocessing = 0;
403393
};
@@ -591,7 +581,6 @@
591581
buildActionMask = 2147483647;
592582
files = (
593583
B3F8BA821C833ABC00F9FBEA /* NFX.swift in Sources */,
594-
17CAEF322106422000F3F22F /* NSURLSessionConfiguration+NFX.m in Sources */,
595584
8FD42BA62028A2D20084211A /* NFXPathNode.swift in Sources */,
596585
B3F8BA8A1C833ABC00F9FBEA /* NFXGenericBodyDetailsController.swift in Sources */,
597586
B3F8BA901C833ABC00F9FBEA /* NFXHTTPModel.swift in Sources */,
@@ -642,7 +631,6 @@
642631
B3F8D67C1C833B1700F9FBEA /* NFXDetailsController_OSX.swift in Sources */,
643632
B3F8BA8F1C833ABC00F9FBEA /* NFXHelper.swift in Sources */,
644633
B3F8BA871C833ABC00F9FBEA /* NFXConstants.swift in Sources */,
645-
17CAEF352106457F00F3F22F /* NSURLSessionConfiguration+NFX.m in Sources */,
646634
8F98A4E3202994CB007B2BB1 /* NFXPathNodeListController_OSX.swift in Sources */,
647635
8F9DEE962033393800E76B7E /* NFXCodableClass.swift in Sources */,
648636
B3F8BA9B1C833ABC00F9FBEA /* NFXProtocol.swift in Sources */,
@@ -822,7 +810,6 @@
822810
B3BC02151C09CDA000C17F3A /* Debug */ = {
823811
isa = XCBuildConfiguration;
824812
buildSettings = {
825-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
826813
ALWAYS_SEARCH_USER_PATHS = NO;
827814
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
828815
CLANG_CXX_LIBRARY = "libc++";
@@ -849,7 +836,6 @@
849836
COPY_PHASE_STRIP = NO;
850837
CURRENT_PROJECT_VERSION = 1;
851838
DEBUG_INFORMATION_FORMAT = dwarf;
852-
DEFINES_MODULE = YES;
853839
ENABLE_STRICT_OBJC_MSGSEND = YES;
854840
ENABLE_TESTABILITY = YES;
855841
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -880,7 +866,6 @@
880866
B3BC02161C09CDA000C17F3A /* Release */ = {
881867
isa = XCBuildConfiguration;
882868
buildSettings = {
883-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
884869
ALWAYS_SEARCH_USER_PATHS = NO;
885870
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
886871
CLANG_CXX_LIBRARY = "libc++";
@@ -907,7 +892,6 @@
907892
COPY_PHASE_STRIP = NO;
908893
CURRENT_PROJECT_VERSION = 1;
909894
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
910-
DEFINES_MODULE = YES;
911895
ENABLE_NS_ASSERTIONS = NO;
912896
ENABLE_STRICT_OBJC_MSGSEND = YES;
913897
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -932,7 +916,6 @@
932916
B3BC02181C09CDA000C17F3A /* Debug */ = {
933917
isa = XCBuildConfiguration;
934918
buildSettings = {
935-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
936919
CLANG_ENABLE_MODULES = YES;
937920
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
938921
DEFINES_MODULE = YES;
@@ -954,7 +937,6 @@
954937
B3BC02191C09CDA000C17F3A /* Release */ = {
955938
isa = XCBuildConfiguration;
956939
buildSettings = {
957-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
958940
CLANG_ENABLE_MODULES = YES;
959941
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
960942
DEFINES_MODULE = YES;
@@ -965,6 +947,7 @@
965947
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
966948
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
967949
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
950+
PRODUCT_BUNDLE_IDENTIFIER = "com.kasketis.netfox-iOS";
968951
PRODUCT_NAME = "$(TARGET_NAME)";
969952
SKIP_INSTALL = YES;
970953
SWIFT_VERSION = 4.0;
@@ -974,7 +957,6 @@
974957
E20FD2EE1C6912D400DCFF61 /* Debug */ = {
975958
isa = XCBuildConfiguration;
976959
buildSettings = {
977-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
978960
CLANG_ENABLE_MODULES = YES;
979961
CODE_SIGN_IDENTITY = "-";
980962
COMBINE_HIDPI_IMAGES = YES;
@@ -1004,7 +986,6 @@
1004986
E20FD2EF1C6912D400DCFF61 /* Release */ = {
1005987
isa = XCBuildConfiguration;
1006988
buildSettings = {
1007-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
1008989
CLANG_ENABLE_MODULES = YES;
1009990
CODE_SIGN_IDENTITY = "-";
1010991
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.compactMap({
175+
let models: [NFXHTTPModel] = jsonModels.flatMap({
176176
let model = NFXHTTPModel()
177177
model.fromJSON(json: $0)
178178
return model

‎netfox/Core/NSURLSessionConfiguration+NFX.h‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎netfox/Core/NSURLSessionConfiguration+NFX.m‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎netfox_ios_demo/AppDelegate.swift‎

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

99
import UIKit
10+
import netfox_ios
1011

1112
@UIApplicationMain
1213
class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -17,6 +18,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1718
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
1819
// Override point for customization after application launch.
1920

21+
NFX.sharedInstance().start()
22+
2023
return true
2124
}
2225

0 commit comments

Comments
 (0)