diff --git a/HyberSDK.xcodeproj/project.pbxproj b/HyberSDK.xcodeproj/project.pbxproj index a65ddf3..571d855 100644 --- a/HyberSDK.xcodeproj/project.pbxproj +++ b/HyberSDK.xcodeproj/project.pbxproj @@ -7,185 +7,150 @@ objects = { /* Begin PBXBuildFile section */ - 84AF4BB42680417D28DA05F6 /* Pods_HyberSDKTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1295B97E627984950D159887 /* Pods_HyberSDKTests.framework */; }; - BA5EE3CA238AD4BB00D2AA12 /* HyberSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BA5EE3C0238AD4BB00D2AA12 /* HyberSDK.framework */; }; - BA5EE3CF238AD4BB00D2AA12 /* HyberSDKTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5EE3CE238AD4BB00D2AA12 /* HyberSDKTests.swift */; }; - BA5EE3D1238AD4BB00D2AA12 /* HyberSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = BA5EE3C3238AD4BB00D2AA12 /* HyberSDK.h */; settings = {ATTRIBUTES = (Public, ); }; }; - BA5EE3DB238ADAD800D2AA12 /* HyberSDK.podspec in Resources */ = {isa = PBXBuildFile; fileRef = BA5EE3DA238ADAD800D2AA12 /* HyberSDK.podspec */; }; - BA5EE3DF238ADB1B00D2AA12 /* HyberSDK.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5EE3DE238ADB1B00D2AA12 /* HyberSDK.swift */; }; - BA5EE3E1238ADB2D00D2AA12 /* BridgingHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = BA5EE3E0238ADB2D00D2AA12 /* BridgingHeader.h */; }; - BA5EE3EF238ADB8C00D2AA12 /* hyber_adapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5EE3EE238ADB8C00D2AA12 /* hyber_adapter.swift */; }; - BA5EE404238ADBD900D2AA12 /* Formatters.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5EE3FC238ADBD800D2AA12 /* Formatters.swift */; }; - BA5EE405238ADBD900D2AA12 /* HyberLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5EE3FD238ADBD900D2AA12 /* HyberLogger.swift */; }; - BA5EE406238ADBD900D2AA12 /* Log.h in Headers */ = {isa = PBXBuildFile; fileRef = BA5EE3FE238ADBD900D2AA12 /* Log.h */; }; - BA5EE407238ADBD900D2AA12 /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5EE3FF238ADBD900D2AA12 /* Utilities.swift */; }; - BA5EE408238ADBD900D2AA12 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5EE400238ADBD900D2AA12 /* Theme.swift */; }; - BA5EE409238ADBD900D2AA12 /* Formatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5EE401238ADBD900D2AA12 /* Formatter.swift */; }; - BA5EE40A238ADBD900D2AA12 /* Benchmarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5EE402238ADBD900D2AA12 /* Benchmarker.swift */; }; - BA5EE40B238ADBD900D2AA12 /* Themes.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5EE403238ADBD900D2AA12 /* Themes.swift */; }; - BA5EE410238ADBF900D2AA12 /* hyber_answer_func.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5EE40D238ADBF800D2AA12 /* hyber_answer_func.swift */; }; - BA5EE411238ADBF900D2AA12 /* params.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5EE40E238ADBF900D2AA12 /* params.swift */; }; - BA5EE412238ADBF900D2AA12 /* add_functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA5EE40F238ADBF900D2AA12 /* add_functions.swift */; }; - BA9189DE2431131B00E16F9B /* json_parser.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA9189DD2431131B00E16F9B /* json_parser.swift */; }; - CC916915F8094B14C0A07743 /* Pods_HyberSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC4881CAE50F2D196BDBD3AC /* Pods_HyberSDK.framework */; }; + 21CF6E7C440E8C87EFF44A94 /* Pods_HyberSDKTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 36BCB4E46C2F114CEAD245C7 /* Pods_HyberSDKTests.framework */; }; + BA1C39F6253CB69000052185 /* HyberSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BA1C39EC253CB69000052185 /* HyberSDK.framework */; }; + BA1C39FB253CB69000052185 /* HyberSDKTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA1C39FA253CB69000052185 /* HyberSDKTests.swift */; }; + BA1C39FD253CB69000052185 /* HyberSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = BA1C39EF253CB69000052185 /* HyberSDK.h */; settings = {ATTRIBUTES = (Public, ); }; }; + BA1C3A07253CB8B600052185 /* BridgingHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = BA1C3A06253CB8B600052185 /* BridgingHeader.h */; }; + BA1C3A09253CB91100052185 /* HyberSDK.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA1C3A08253CB91100052185 /* HyberSDK.swift */; }; + BA8D3413253CC128005BDC33 /* add_functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA8D3412253CC128005BDC33 /* add_functions.swift */; }; + BA8D3417253CC12E005BDC33 /* json_parser.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA8D3414253CC12E005BDC33 /* json_parser.swift */; }; + BA8D3418253CC12E005BDC33 /* hyber_answer_func.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA8D3415253CC12E005BDC33 /* hyber_answer_func.swift */; }; + BA8D3419253CC12E005BDC33 /* params.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA8D3416253CC12E005BDC33 /* params.swift */; }; + BA8D341C253CC14A005BDC33 /* hyber_adapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = BA8D341B253CC14A005BDC33 /* hyber_adapter.swift */; }; + C04482AA53327CA7596F1B6C /* Pods_HyberSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BE323D9F391699D4AA1D26E /* Pods_HyberSDK.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - BA5EE3CB238AD4BB00D2AA12 /* PBXContainerItemProxy */ = { + BA1C39F7253CB69000052185 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = BA5EE3B7238AD4BB00D2AA12 /* Project object */; + containerPortal = BA1C39E3253CB68F00052185 /* Project object */; proxyType = 1; - remoteGlobalIDString = BA5EE3BF238AD4BB00D2AA12; - remoteInfo = "Hyber-SDK-iOS"; + remoteGlobalIDString = BA1C39EB253CB69000052185; + remoteInfo = HyberSDK; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 1295B97E627984950D159887 /* Pods_HyberSDKTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HyberSDKTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 5B664CB4F2EF3BABC37013AC /* Pods-HyberSDK.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HyberSDK.debug.xcconfig"; path = "Target Support Files/Pods-HyberSDK/Pods-HyberSDK.debug.xcconfig"; sourceTree = ""; }; - AC4881CAE50F2D196BDBD3AC /* Pods_HyberSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HyberSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - BA5EE3C0238AD4BB00D2AA12 /* HyberSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HyberSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - BA5EE3C3238AD4BB00D2AA12 /* HyberSDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HyberSDK.h; sourceTree = ""; }; - BA5EE3C4238AD4BB00D2AA12 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - BA5EE3C9238AD4BB00D2AA12 /* HyberSDKTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = HyberSDKTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - BA5EE3CE238AD4BB00D2AA12 /* HyberSDKTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HyberSDKTests.swift; sourceTree = ""; }; - BA5EE3D0238AD4BB00D2AA12 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - BA5EE3DA238ADAD800D2AA12 /* HyberSDK.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HyberSDK.podspec; sourceTree = ""; }; - BA5EE3DE238ADB1B00D2AA12 /* HyberSDK.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HyberSDK.swift; sourceTree = ""; }; - BA5EE3E0238ADB2D00D2AA12 /* BridgingHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BridgingHeader.h; sourceTree = ""; }; - BA5EE3EE238ADB8C00D2AA12 /* hyber_adapter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = hyber_adapter.swift; sourceTree = ""; }; - BA5EE3FC238ADBD800D2AA12 /* Formatters.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Formatters.swift; sourceTree = ""; }; - BA5EE3FD238ADBD900D2AA12 /* HyberLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HyberLogger.swift; sourceTree = ""; }; - BA5EE3FE238ADBD900D2AA12 /* Log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Log.h; sourceTree = ""; }; - BA5EE3FF238ADBD900D2AA12 /* Utilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Utilities.swift; sourceTree = ""; }; - BA5EE400238ADBD900D2AA12 /* Theme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = ""; }; - BA5EE401238ADBD900D2AA12 /* Formatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Formatter.swift; sourceTree = ""; }; - BA5EE402238ADBD900D2AA12 /* Benchmarker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Benchmarker.swift; sourceTree = ""; }; - BA5EE403238ADBD900D2AA12 /* Themes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Themes.swift; sourceTree = ""; }; - BA5EE40D238ADBF800D2AA12 /* hyber_answer_func.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = hyber_answer_func.swift; sourceTree = ""; }; - BA5EE40E238ADBF900D2AA12 /* params.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = params.swift; sourceTree = ""; }; - BA5EE40F238ADBF900D2AA12 /* add_functions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = add_functions.swift; sourceTree = ""; }; - BA9189DD2431131B00E16F9B /* json_parser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = json_parser.swift; sourceTree = ""; }; - CA9147BC9AACA1046DFDCE57 /* Pods-HyberSDKTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HyberSDKTests.release.xcconfig"; path = "Target Support Files/Pods-HyberSDKTests/Pods-HyberSDKTests.release.xcconfig"; sourceTree = ""; }; - E94C6B52F27BF51249CA43A0 /* Pods-HyberSDKTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HyberSDKTests.debug.xcconfig"; path = "Target Support Files/Pods-HyberSDKTests/Pods-HyberSDKTests.debug.xcconfig"; sourceTree = ""; }; - FDD587900A8D050CA604C9BE /* Pods-HyberSDK.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HyberSDK.release.xcconfig"; path = "Target Support Files/Pods-HyberSDK/Pods-HyberSDK.release.xcconfig"; sourceTree = ""; }; + 003A391C970765D29E44B64E /* Pods-HyberSDK.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HyberSDK.release.xcconfig"; path = "Target Support Files/Pods-HyberSDK/Pods-HyberSDK.release.xcconfig"; sourceTree = ""; }; + 24F0FA61899A8D22630BD9D3 /* Pods-HyberSDKTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HyberSDKTests.release.xcconfig"; path = "Target Support Files/Pods-HyberSDKTests/Pods-HyberSDKTests.release.xcconfig"; sourceTree = ""; }; + 2BE6F119B5BC34CF931A6318 /* Pods-HyberSDK.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HyberSDK.debug.xcconfig"; path = "Target Support Files/Pods-HyberSDK/Pods-HyberSDK.debug.xcconfig"; sourceTree = ""; }; + 36BCB4E46C2F114CEAD245C7 /* Pods_HyberSDKTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HyberSDKTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 62EFA8335FEA29B595B9A5BB /* Pods-HyberSDKTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HyberSDKTests.debug.xcconfig"; path = "Target Support Files/Pods-HyberSDKTests/Pods-HyberSDKTests.debug.xcconfig"; sourceTree = ""; }; + 8BE323D9F391699D4AA1D26E /* Pods_HyberSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HyberSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + BA1C39EC253CB69000052185 /* HyberSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HyberSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + BA1C39EF253CB69000052185 /* HyberSDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HyberSDK.h; sourceTree = ""; }; + BA1C39F0253CB69000052185 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + BA1C39F5253CB69000052185 /* HyberSDKTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = HyberSDKTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + BA1C39FA253CB69000052185 /* HyberSDKTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HyberSDKTests.swift; sourceTree = ""; }; + BA1C39FC253CB69000052185 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + BA1C3A06253CB8B600052185 /* BridgingHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BridgingHeader.h; sourceTree = ""; }; + BA1C3A08253CB91100052185 /* HyberSDK.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HyberSDK.swift; sourceTree = ""; }; + BA8D3412253CC128005BDC33 /* add_functions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = add_functions.swift; sourceTree = ""; }; + BA8D3414253CC12E005BDC33 /* json_parser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = json_parser.swift; sourceTree = ""; }; + BA8D3415253CC12E005BDC33 /* hyber_answer_func.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = hyber_answer_func.swift; sourceTree = ""; }; + BA8D3416253CC12E005BDC33 /* params.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = params.swift; sourceTree = ""; }; + BA8D341B253CC14A005BDC33 /* hyber_adapter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = hyber_adapter.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - BA5EE3BD238AD4BB00D2AA12 /* Frameworks */ = { + BA1C39E9253CB69000052185 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - CC916915F8094B14C0A07743 /* Pods_HyberSDK.framework in Frameworks */, + C04482AA53327CA7596F1B6C /* Pods_HyberSDK.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - BA5EE3C6238AD4BB00D2AA12 /* Frameworks */ = { + BA1C39F2253CB69000052185 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - BA5EE3CA238AD4BB00D2AA12 /* HyberSDK.framework in Frameworks */, - 84AF4BB42680417D28DA05F6 /* Pods_HyberSDKTests.framework in Frameworks */, + BA1C39F6253CB69000052185 /* HyberSDK.framework in Frameworks */, + 21CF6E7C440E8C87EFF44A94 /* Pods_HyberSDKTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 68815D19F0ED8193B1A082BB /* Frameworks */ = { + 575507AECB6C51AC3B742480 /* Frameworks */ = { isa = PBXGroup; children = ( - AC4881CAE50F2D196BDBD3AC /* Pods_HyberSDK.framework */, - 1295B97E627984950D159887 /* Pods_HyberSDKTests.framework */, + 8BE323D9F391699D4AA1D26E /* Pods_HyberSDK.framework */, + 36BCB4E46C2F114CEAD245C7 /* Pods_HyberSDKTests.framework */, ); name = Frameworks; sourceTree = ""; }; - BA5EE3B6238AD4BB00D2AA12 = { + BA1C39E2253CB68F00052185 = { isa = PBXGroup; children = ( - BA5EE3DA238ADAD800D2AA12 /* HyberSDK.podspec */, - BA5EE3C2238AD4BB00D2AA12 /* HyberSDK */, - BA5EE3CD238AD4BB00D2AA12 /* HyberSDKTests */, - BA5EE3C1238AD4BB00D2AA12 /* Products */, - EBCB302523BFA044958CB5CB /* Pods */, - 68815D19F0ED8193B1A082BB /* Frameworks */, + BA1C39EE253CB69000052185 /* HyberSDK */, + BA1C39F9253CB69000052185 /* HyberSDKTests */, + BA1C39ED253CB69000052185 /* Products */, + E9D77FC4D04AFBB6DE599CAA /* Pods */, + 575507AECB6C51AC3B742480 /* Frameworks */, ); sourceTree = ""; }; - BA5EE3C1238AD4BB00D2AA12 /* Products */ = { + BA1C39ED253CB69000052185 /* Products */ = { isa = PBXGroup; children = ( - BA5EE3C0238AD4BB00D2AA12 /* HyberSDK.framework */, - BA5EE3C9238AD4BB00D2AA12 /* HyberSDKTests.xctest */, + BA1C39EC253CB69000052185 /* HyberSDK.framework */, + BA1C39F5253CB69000052185 /* HyberSDKTests.xctest */, ); name = Products; sourceTree = ""; }; - BA5EE3C2238AD4BB00D2AA12 /* HyberSDK */ = { + BA1C39EE253CB69000052185 /* HyberSDK */ = { isa = PBXGroup; children = ( - BA5EE40C238ADBE400D2AA12 /* settings */, - BA5EE3FB238ADBC900D2AA12 /* logger */, - BA5EE3ED238ADB7900D2AA12 /* api */, - BA5EE3C3238AD4BB00D2AA12 /* HyberSDK.h */, - BA5EE3C4238AD4BB00D2AA12 /* Info.plist */, - BA5EE3E0238ADB2D00D2AA12 /* BridgingHeader.h */, - BA5EE3DE238ADB1B00D2AA12 /* HyberSDK.swift */, + BA8D341A253CC142005BDC33 /* api */, + BA8D3411253CC117005BDC33 /* settings */, + BA1C3A08253CB91100052185 /* HyberSDK.swift */, + BA1C3A06253CB8B600052185 /* BridgingHeader.h */, + BA1C39EF253CB69000052185 /* HyberSDK.h */, + BA1C39F0253CB69000052185 /* Info.plist */, ); path = HyberSDK; sourceTree = ""; }; - BA5EE3CD238AD4BB00D2AA12 /* HyberSDKTests */ = { + BA1C39F9253CB69000052185 /* HyberSDKTests */ = { isa = PBXGroup; children = ( - BA5EE3CE238AD4BB00D2AA12 /* HyberSDKTests.swift */, - BA5EE3D0238AD4BB00D2AA12 /* Info.plist */, + BA1C39FA253CB69000052185 /* HyberSDKTests.swift */, + BA1C39FC253CB69000052185 /* Info.plist */, ); path = HyberSDKTests; sourceTree = ""; }; - BA5EE3ED238ADB7900D2AA12 /* api */ = { + BA8D3411253CC117005BDC33 /* settings */ = { isa = PBXGroup; children = ( - BA5EE3EE238ADB8C00D2AA12 /* hyber_adapter.swift */, + BA8D3415253CC12E005BDC33 /* hyber_answer_func.swift */, + BA8D3414253CC12E005BDC33 /* json_parser.swift */, + BA8D3416253CC12E005BDC33 /* params.swift */, + BA8D3412253CC128005BDC33 /* add_functions.swift */, ); - path = api; - sourceTree = ""; - }; - BA5EE3FB238ADBC900D2AA12 /* logger */ = { - isa = PBXGroup; - children = ( - BA5EE402238ADBD900D2AA12 /* Benchmarker.swift */, - BA5EE401238ADBD900D2AA12 /* Formatter.swift */, - BA5EE3FC238ADBD800D2AA12 /* Formatters.swift */, - BA5EE3FD238ADBD900D2AA12 /* HyberLogger.swift */, - BA5EE3FE238ADBD900D2AA12 /* Log.h */, - BA5EE400238ADBD900D2AA12 /* Theme.swift */, - BA5EE403238ADBD900D2AA12 /* Themes.swift */, - BA5EE3FF238ADBD900D2AA12 /* Utilities.swift */, - ); - path = logger; + path = settings; sourceTree = ""; }; - BA5EE40C238ADBE400D2AA12 /* settings */ = { + BA8D341A253CC142005BDC33 /* api */ = { isa = PBXGroup; children = ( - BA5EE40F238ADBF900D2AA12 /* add_functions.swift */, - BA5EE40D238ADBF800D2AA12 /* hyber_answer_func.swift */, - BA5EE40E238ADBF900D2AA12 /* params.swift */, - BA9189DD2431131B00E16F9B /* json_parser.swift */, + BA8D341B253CC14A005BDC33 /* hyber_adapter.swift */, ); - path = settings; + path = api; sourceTree = ""; }; - EBCB302523BFA044958CB5CB /* Pods */ = { + E9D77FC4D04AFBB6DE599CAA /* Pods */ = { isa = PBXGroup; children = ( - 5B664CB4F2EF3BABC37013AC /* Pods-HyberSDK.debug.xcconfig */, - FDD587900A8D050CA604C9BE /* Pods-HyberSDK.release.xcconfig */, - E94C6B52F27BF51249CA43A0 /* Pods-HyberSDKTests.debug.xcconfig */, - CA9147BC9AACA1046DFDCE57 /* Pods-HyberSDKTests.release.xcconfig */, + 2BE6F119B5BC34CF931A6318 /* Pods-HyberSDK.debug.xcconfig */, + 003A391C970765D29E44B64E /* Pods-HyberSDK.release.xcconfig */, + 62EFA8335FEA29B595B9A5BB /* Pods-HyberSDKTests.debug.xcconfig */, + 24F0FA61899A8D22630BD9D3 /* Pods-HyberSDKTests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -193,104 +158,103 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - BA5EE3BB238AD4BB00D2AA12 /* Headers */ = { + BA1C39E7253CB69000052185 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - BA5EE406238ADBD900D2AA12 /* Log.h in Headers */, - BA5EE3D1238AD4BB00D2AA12 /* HyberSDK.h in Headers */, - BA5EE3E1238ADB2D00D2AA12 /* BridgingHeader.h in Headers */, + BA1C39FD253CB69000052185 /* HyberSDK.h in Headers */, + BA1C3A07253CB8B600052185 /* BridgingHeader.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - BA5EE3BF238AD4BB00D2AA12 /* HyberSDK */ = { + BA1C39EB253CB69000052185 /* HyberSDK */ = { isa = PBXNativeTarget; - buildConfigurationList = BA5EE3D4238AD4BB00D2AA12 /* Build configuration list for PBXNativeTarget "HyberSDK" */; + buildConfigurationList = BA1C3A00253CB69000052185 /* Build configuration list for PBXNativeTarget "HyberSDK" */; buildPhases = ( - 94F7526C011031545E11584C /* [CP] Check Pods Manifest.lock */, - BA5EE3BB238AD4BB00D2AA12 /* Headers */, - BA5EE3BC238AD4BB00D2AA12 /* Sources */, - BA5EE3BD238AD4BB00D2AA12 /* Frameworks */, - BA5EE3BE238AD4BB00D2AA12 /* Resources */, + 16588151377DBC2EBB646DB2 /* [CP] Check Pods Manifest.lock */, + BA1C39E7253CB69000052185 /* Headers */, + BA1C39E8253CB69000052185 /* Sources */, + BA1C39E9253CB69000052185 /* Frameworks */, + BA1C39EA253CB69000052185 /* Resources */, ); buildRules = ( ); dependencies = ( ); name = HyberSDK; - productName = "Hyber-SDK-iOS"; - productReference = BA5EE3C0238AD4BB00D2AA12 /* HyberSDK.framework */; + productName = HyberSDK; + productReference = BA1C39EC253CB69000052185 /* HyberSDK.framework */; productType = "com.apple.product-type.framework"; }; - BA5EE3C8238AD4BB00D2AA12 /* HyberSDKTests */ = { + BA1C39F4253CB69000052185 /* HyberSDKTests */ = { isa = PBXNativeTarget; - buildConfigurationList = BA5EE3D7238AD4BB00D2AA12 /* Build configuration list for PBXNativeTarget "HyberSDKTests" */; + buildConfigurationList = BA1C3A03253CB69000052185 /* Build configuration list for PBXNativeTarget "HyberSDKTests" */; buildPhases = ( - A156AE0838550FBF11546E51 /* [CP] Check Pods Manifest.lock */, - BA5EE3C5238AD4BB00D2AA12 /* Sources */, - BA5EE3C6238AD4BB00D2AA12 /* Frameworks */, - BA5EE3C7238AD4BB00D2AA12 /* Resources */, + 99CA9D1CDAD13CBFE480590A /* [CP] Check Pods Manifest.lock */, + BA1C39F1253CB69000052185 /* Sources */, + BA1C39F2253CB69000052185 /* Frameworks */, + BA1C39F3253CB69000052185 /* Resources */, + 849CC2287BC371ADD423DD46 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); dependencies = ( - BA5EE3CC238AD4BB00D2AA12 /* PBXTargetDependency */, + BA1C39F8253CB69000052185 /* PBXTargetDependency */, ); name = HyberSDKTests; - productName = "Hyber-SDK-iOSTests"; - productReference = BA5EE3C9238AD4BB00D2AA12 /* HyberSDKTests.xctest */; + productName = HyberSDKTests; + productReference = BA1C39F5253CB69000052185 /* HyberSDKTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - BA5EE3B7238AD4BB00D2AA12 /* Project object */ = { + BA1C39E3253CB68F00052185 /* Project object */ = { isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1020; LastUpgradeCheck = 1020; - ORGANIZATIONNAME = GMS; + ORGANIZATIONNAME = HYBER; TargetAttributes = { - BA5EE3BF238AD4BB00D2AA12 = { + BA1C39EB253CB69000052185 = { CreatedOnToolsVersion = 10.2.1; LastSwiftMigration = 1020; }; - BA5EE3C8238AD4BB00D2AA12 = { + BA1C39F4253CB69000052185 = { CreatedOnToolsVersion = 10.2.1; }; }; }; - buildConfigurationList = BA5EE3BA238AD4BB00D2AA12 /* Build configuration list for PBXProject "HyberSDK" */; + buildConfigurationList = BA1C39E6253CB68F00052185 /* Build configuration list for PBXProject "HyberSDK" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, ); - mainGroup = BA5EE3B6238AD4BB00D2AA12; - productRefGroup = BA5EE3C1238AD4BB00D2AA12 /* Products */; + mainGroup = BA1C39E2253CB68F00052185; + productRefGroup = BA1C39ED253CB69000052185 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - BA5EE3BF238AD4BB00D2AA12 /* HyberSDK */, - BA5EE3C8238AD4BB00D2AA12 /* HyberSDKTests */, + BA1C39EB253CB69000052185 /* HyberSDK */, + BA1C39F4253CB69000052185 /* HyberSDKTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - BA5EE3BE238AD4BB00D2AA12 /* Resources */ = { + BA1C39EA253CB69000052185 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - BA5EE3DB238ADAD800D2AA12 /* HyberSDK.podspec in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; - BA5EE3C7238AD4BB00D2AA12 /* Resources */ = { + BA1C39F3253CB69000052185 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -300,7 +264,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 94F7526C011031545E11584C /* [CP] Check Pods Manifest.lock */ = { + 16588151377DBC2EBB646DB2 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -322,7 +286,24 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - A156AE0838550FBF11546E51 /* [CP] Check Pods Manifest.lock */ = { + 849CC2287BC371ADD423DD46 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-HyberSDKTests/Pods-HyberSDKTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-HyberSDKTests/Pods-HyberSDKTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-HyberSDKTests/Pods-HyberSDKTests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 99CA9D1CDAD13CBFE480590A /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -347,46 +328,39 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - BA5EE3BC238AD4BB00D2AA12 /* Sources */ = { + BA1C39E8253CB69000052185 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - BA5EE405238ADBD900D2AA12 /* HyberLogger.swift in Sources */, - BA5EE3EF238ADB8C00D2AA12 /* hyber_adapter.swift in Sources */, - BA5EE410238ADBF900D2AA12 /* hyber_answer_func.swift in Sources */, - BA5EE404238ADBD900D2AA12 /* Formatters.swift in Sources */, - BA5EE407238ADBD900D2AA12 /* Utilities.swift in Sources */, - BA5EE40B238ADBD900D2AA12 /* Themes.swift in Sources */, - BA5EE40A238ADBD900D2AA12 /* Benchmarker.swift in Sources */, - BA5EE412238ADBF900D2AA12 /* add_functions.swift in Sources */, - BA5EE408238ADBD900D2AA12 /* Theme.swift in Sources */, - BA5EE409238ADBD900D2AA12 /* Formatter.swift in Sources */, - BA5EE411238ADBF900D2AA12 /* params.swift in Sources */, - BA5EE3DF238ADB1B00D2AA12 /* HyberSDK.swift in Sources */, - BA9189DE2431131B00E16F9B /* json_parser.swift in Sources */, + BA8D341C253CC14A005BDC33 /* hyber_adapter.swift in Sources */, + BA8D3417253CC12E005BDC33 /* json_parser.swift in Sources */, + BA1C3A09253CB91100052185 /* HyberSDK.swift in Sources */, + BA8D3418253CC12E005BDC33 /* hyber_answer_func.swift in Sources */, + BA8D3413253CC128005BDC33 /* add_functions.swift in Sources */, + BA8D3419253CC12E005BDC33 /* params.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - BA5EE3C5238AD4BB00D2AA12 /* Sources */ = { + BA1C39F1253CB69000052185 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - BA5EE3CF238AD4BB00D2AA12 /* HyberSDKTests.swift in Sources */, + BA1C39FB253CB69000052185 /* HyberSDKTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - BA5EE3CC238AD4BB00D2AA12 /* PBXTargetDependency */ = { + BA1C39F8253CB69000052185 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = BA5EE3BF238AD4BB00D2AA12 /* HyberSDK */; - targetProxy = BA5EE3CB238AD4BB00D2AA12 /* PBXContainerItemProxy */; + target = BA1C39EB253CB69000052185 /* HyberSDK */; + targetProxy = BA1C39F7253CB69000052185 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - BA5EE3D2238AD4BB00D2AA12 /* Debug */ = { + BA1C39FE253CB69000052185 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -450,7 +424,7 @@ }; name = Debug; }; - BA5EE3D3238AD4BB00D2AA12 /* Release */ = { + BA1C39FF253CB69000052185 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -508,9 +482,9 @@ }; name = Release; }; - BA5EE3D5238AD4BB00D2AA12 /* Debug */ = { + BA1C3A01253CB69000052185 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5B664CB4F2EF3BABC37013AC /* Pods-HyberSDK.debug.xcconfig */; + baseConfigurationReference = 2BE6F119B5BC34CF931A6318 /* Pods-HyberSDK.debug.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; @@ -520,7 +494,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/HyberSDK/Info.plist"; + INFOPLIST_FILE = HyberSDK/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -536,9 +510,9 @@ }; name = Debug; }; - BA5EE3D6238AD4BB00D2AA12 /* Release */ = { + BA1C3A02253CB69000052185 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FDD587900A8D050CA604C9BE /* Pods-HyberSDK.release.xcconfig */; + baseConfigurationReference = 003A391C970765D29E44B64E /* Pods-HyberSDK.release.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; @@ -548,7 +522,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "$(SRCROOT)/HyberSDK/Info.plist"; + INFOPLIST_FILE = HyberSDK/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -563,40 +537,40 @@ }; name = Release; }; - BA5EE3D8238AD4BB00D2AA12 /* Debug */ = { + BA1C3A04253CB69000052185 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E94C6B52F27BF51249CA43A0 /* Pods-HyberSDKTests.debug.xcconfig */; + baseConfigurationReference = 62EFA8335FEA29B595B9A5BB /* Pods-HyberSDKTests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = 74UT6QD789; - INFOPLIST_FILE = "Hyber-SDK-iOSTests/Info.plist"; + INFOPLIST_FILE = HyberSDKTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.hyber.ios.hybersdkios.Hyber-SDK-iOSTests"; + PRODUCT_BUNDLE_IDENTIFIER = com.hyber.ios.hybersdkios.HyberSDKTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; - BA5EE3D9238AD4BB00D2AA12 /* Release */ = { + BA1C3A05253CB69000052185 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CA9147BC9AACA1046DFDCE57 /* Pods-HyberSDKTests.release.xcconfig */; + baseConfigurationReference = 24F0FA61899A8D22630BD9D3 /* Pods-HyberSDKTests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = 74UT6QD789; - INFOPLIST_FILE = "Hyber-SDK-iOSTests/Info.plist"; + INFOPLIST_FILE = HyberSDKTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.hyber.ios.hybersdkios.Hyber-SDK-iOSTests"; + PRODUCT_BUNDLE_IDENTIFIER = com.hyber.ios.hybersdkios.HyberSDKTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -606,34 +580,34 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - BA5EE3BA238AD4BB00D2AA12 /* Build configuration list for PBXProject "HyberSDK" */ = { + BA1C39E6253CB68F00052185 /* Build configuration list for PBXProject "HyberSDK" */ = { isa = XCConfigurationList; buildConfigurations = ( - BA5EE3D2238AD4BB00D2AA12 /* Debug */, - BA5EE3D3238AD4BB00D2AA12 /* Release */, + BA1C39FE253CB69000052185 /* Debug */, + BA1C39FF253CB69000052185 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - BA5EE3D4238AD4BB00D2AA12 /* Build configuration list for PBXNativeTarget "HyberSDK" */ = { + BA1C3A00253CB69000052185 /* Build configuration list for PBXNativeTarget "HyberSDK" */ = { isa = XCConfigurationList; buildConfigurations = ( - BA5EE3D5238AD4BB00D2AA12 /* Debug */, - BA5EE3D6238AD4BB00D2AA12 /* Release */, + BA1C3A01253CB69000052185 /* Debug */, + BA1C3A02253CB69000052185 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - BA5EE3D7238AD4BB00D2AA12 /* Build configuration list for PBXNativeTarget "HyberSDKTests" */ = { + BA1C3A03253CB69000052185 /* Build configuration list for PBXNativeTarget "HyberSDKTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - BA5EE3D8238AD4BB00D2AA12 /* Debug */, - BA5EE3D9238AD4BB00D2AA12 /* Release */, + BA1C3A04253CB69000052185 /* Debug */, + BA1C3A05253CB69000052185 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = BA5EE3B7238AD4BB00D2AA12 /* Project object */; + rootObject = BA1C39E3253CB68F00052185 /* Project object */; } diff --git a/HyberSDK.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/HyberSDK.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 306f5a3..056e10d 100644 --- a/HyberSDK.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/HyberSDK.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:HyberSDK.xcodeproj"> diff --git a/HyberSDK.xcodeproj/project.xcworkspace/xcuserdata/imperituroard.xcuserdatad/UserInterfaceState.xcuserstate b/HyberSDK.xcodeproj/project.xcworkspace/xcuserdata/imperituroard.xcuserdatad/UserInterfaceState.xcuserstate index 8b3da7c..f52bac9 100644 Binary files a/HyberSDK.xcodeproj/project.xcworkspace/xcuserdata/imperituroard.xcuserdatad/UserInterfaceState.xcuserstate and b/HyberSDK.xcodeproj/project.xcworkspace/xcuserdata/imperituroard.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/HyberSDK.xcodeproj/xcuserdata/imperituroard.xcuserdatad/xcschemes/xcschememanagement.plist b/HyberSDK.xcodeproj/xcuserdata/imperituroard.xcuserdatad/xcschemes/xcschememanagement.plist index 299d7d3..cd16f7a 100644 --- a/HyberSDK.xcodeproj/xcuserdata/imperituroard.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/HyberSDK.xcodeproj/xcuserdata/imperituroard.xcuserdatad/xcschemes/xcschememanagement.plist @@ -4,15 +4,10 @@ SchemeUserState - Hyber-SDK-iOS.xcscheme_^#shared#^_ - - orderHint - 25 - HyberSDK.xcscheme_^#shared#^_ orderHint - 6 + 9 diff --git a/HyberSDK.xcworkspace/contents.xcworkspacedata b/HyberSDK.xcworkspace/contents.xcworkspacedata index f16181d..5598356 100644 --- a/HyberSDK.xcworkspace/contents.xcworkspacedata +++ b/HyberSDK.xcworkspace/contents.xcworkspacedata @@ -2,9 +2,9 @@ + location = "group:HyberSDK.xcodeproj"> + location = "group:Pods/Pods.xcodeproj"> diff --git a/HyberSDK.xcworkspace/xcuserdata/imperituroard.xcuserdatad/UserInterfaceState.xcuserstate b/HyberSDK.xcworkspace/xcuserdata/imperituroard.xcuserdatad/UserInterfaceState.xcuserstate index b95399b..0de684b 100644 Binary files a/HyberSDK.xcworkspace/xcuserdata/imperituroard.xcuserdatad/UserInterfaceState.xcuserstate and b/HyberSDK.xcworkspace/xcuserdata/imperituroard.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/HyberSDK/HyberSDK.h b/HyberSDK/HyberSDK.h index b405a18..ef0a918 100644 --- a/HyberSDK/HyberSDK.h +++ b/HyberSDK/HyberSDK.h @@ -1,9 +1,9 @@ // -// Hyber_SDK_iOS.h -// Hyber-SDK-iOS +// HyberSDK.h +// HyberSDK // -// Created by Дмитрий Буйновский on 24/11/2019. -// Copyright © 2019 GMS. All rights reserved. +// Created by Kirill Kotov on 01/10/2020. +// Copyright © 2020 HYBER. All rights reserved. // #import @@ -12,9 +12,8 @@ //! Project version number for HyberSDK. FOUNDATION_EXPORT double HyberSDKVersionNumber; -//! Project version string for Hyber_SDK_iOS. +//! Project version string for HyberSDK. FOUNDATION_EXPORT const unsigned char HyberSDKVersionString[]; // In this header, you should import all the public headers of your framework using statements like #import - diff --git a/HyberSDK/HyberSDK.swift b/HyberSDK/HyberSDK.swift index ec3c5d4..35184ae 100644 --- a/HyberSDK/HyberSDK.swift +++ b/HyberSDK/HyberSDK.swift @@ -2,7 +2,7 @@ // hybersdk.swift // hybersdk // -// Created by ard on 08/05/2019. +// Created by Kirill Kotov on 08/05/2019. // Copyright © 2019 ard. All rights reserved. // @@ -10,6 +10,7 @@ import Foundation import UIKit import CryptoSwift +import SwiftyBeaver //import CoreData //import FirebaseCore @@ -28,7 +29,10 @@ public extension Notification.Name { public class HyberSDK { - public init() + public init( + //platform_branch: PushSdkParametersPublic, + log_level: String = "error" + ) { Constants.registrationstatus = UserDefaults.standard.bool(forKey: "registrationstatus") Constants.hyber_registration_token = UserDefaults.standard.string(forKey: "hyber_registration_token") @@ -69,7 +73,6 @@ public class HyberSDK { let answer_b = AnswerBuider.init() - //Procedure 1. new device registration //x_hyber_sesion_id - firebase FCM token //x_hyber_ios_bundle_id - ios application bundle id diff --git a/HyberSDK/Info.plist b/HyberSDK/Info.plist index 3f26fa0..b981d3b 100644 --- a/HyberSDK/Info.plist +++ b/HyberSDK/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.8 + 1.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/HyberSDK/api/hyber_adapter.swift b/HyberSDK/api/hyber_adapter.swift index ce0bba6..99ab5af 100644 --- a/HyberSDK/api/hyber_adapter.swift +++ b/HyberSDK/api/hyber_adapter.swift @@ -2,13 +2,15 @@ // hyber_adapter.swift // test222 // -// Created by ard on 16/04/2019. +// Created by Kirill Kotov on 16/04/2019. // Copyright © 2019 ard. All rights reserved. // import Foundation import CryptoSwift +import RetrofireSwift + class HyberAPI { private let jsonparser = AnswParser.init() @@ -102,7 +104,7 @@ class HyberAPI { print("resp dsdfasdf") print(response) - let str_resp = response as! String + let str_resp = response! as String print(str_resp) let resp_register_parsed = self.jsonparser.registerJParse(str_resp: str_resp) @@ -194,8 +196,8 @@ class HyberAPI { request.addValue(X_Hyber_Session_Id, forHTTPHeaderField: "X-Hyber-Session-Id") request.addValue(sha256_auth_token, forHTTPHeaderField: "X-Hyber-Auth-Token") - print(request.allHTTPHeaderFields) - print(request.httpBody) + print(request.allHTTPHeaderFields as Any) + print(request.httpBody as Any) print(params) request.httpBody = try! JSONSerialization.data(withJSONObject: params, options: []) @@ -218,7 +220,7 @@ class HyberAPI { answ = self.answer_buider.general_answer_struct(resp_code: String(httpResponse.statusCode), body_json: body_json, description: "Success") - print(jsonData) + print(jsonData as Any) self.processor.file_logger(message: "\(procedure_name) response jsonData is \(jsonData)", loglevel: ".debug") self.processor.file_logger(message: "\(procedure_name) response code is \(httpResponse.statusCode)", loglevel: ".debug") @@ -248,7 +250,7 @@ class HyberAPI { if response == "SUCCESS" { - self.processor.file_logger(message: "\(procedure_name) success response body is \(response)", loglevel: ".debug") } + self.processor.file_logger(message: "\(procedure_name) success response body is \(String(describing: response))", loglevel: ".debug") } case 401: Constants.registrationstatus = false UserDefaults.standard.set(false, forKey: "registrationstatus") @@ -318,7 +320,7 @@ class HyberAPI { request.httpBody = try! JSONSerialization.data(withJSONObject: params, options: []) - print(request.allHTTPHeaderFields) + print(request.allHTTPHeaderFields as Any) print(params) let dataTask = session.dataTask(with: request as URLRequest) @@ -339,15 +341,15 @@ class HyberAPI { answ = self.answer_buider.general_answer_struct(resp_code: String(httpResponse.statusCode), body_json: "deviceId: \(devid_parsed.deviceId)", description: "Success") - self.processor.file_logger(message: "\(procedure_name) response jsonData is \(jsonData)", loglevel: ".debug") + self.processor.file_logger(message: "\(procedure_name) response jsonData is \(String(describing: jsonData))", loglevel: ".debug") self.processor.file_logger(message: "\(procedure_name) response code is \(httpResponse.statusCode)", loglevel: ".debug") - self.processor.file_logger(message: "\(procedure_name) response data is \(data)", loglevel: ".debug") + self.processor.file_logger(message: "\(procedure_name) response data is \(String(describing: data))", loglevel: ".debug") self.processor.file_logger(message: "\(procedure_name) response debugDescription is \(httpResponse.debugDescription)", loglevel: ".debug") - print(jsonData) + print(jsonData as Any) print(httpResponse.statusCode) switch (httpResponse.statusCode) @@ -359,7 +361,7 @@ class HyberAPI { if response == "SUCCESS" { - self.processor.file_logger(message: "\(procedure_name) success response body is \(response)", loglevel: ".debug") } + self.processor.file_logger(message: "\(procedure_name) success response body is \(String(describing: response))", loglevel: ".debug") } case 401: Constants.registrationstatus = false UserDefaults.standard.set(false, forKey: "registrationstatus") @@ -418,8 +420,8 @@ class HyberAPI { request.addValue(String(timet), forHTTPHeaderField: "X-Hyber-Timestamp") request.addValue(sha256_auth_token, forHTTPHeaderField: "X-Hyber-Auth-Token") - print(request.allHTTPHeaderFields) - print(request.httpBody) + print(request.allHTTPHeaderFields as Any) + print(request.httpBody as Any) //request.httpBody = try! JSONSerialization.data(withJSONObject: params, options: []) @@ -443,15 +445,15 @@ class HyberAPI { //answ = self.answer_buider.general_answer(resp_code: String(httpResponse.statusCode), body_json: body_json, description: "Success") - self.processor.file_logger(message: "\(procedure_name) response jsonData is \(jsonData)", loglevel: ".debug") + self.processor.file_logger(message: "\(procedure_name) response jsonData is \(String(describing: jsonData))", loglevel: ".debug") self.processor.file_logger(message: "\(procedure_name) response code is \(httpResponse.statusCode)", loglevel: ".debug") - self.processor.file_logger(message: "\(procedure_name) response data is \(data)", loglevel: ".debug") + self.processor.file_logger(message: "\(procedure_name) response data is \(String(describing: data))", loglevel: ".debug") self.processor.file_logger(message: "\(procedure_name) response debugDescription is \(httpResponse.debugDescription)", loglevel: ".debug") - print(jsonData) + print(jsonData as Any) print(httpResponse.statusCode) switch (httpResponse.statusCode) @@ -465,7 +467,7 @@ class HyberAPI { if response == "SUCCESS" { - self.processor.file_logger(message: "\(procedure_name) success response body is \(response)", loglevel: ".debug") + self.processor.file_logger(message: "\(procedure_name) success response body is \(String(describing: response))", loglevel: ".debug") } UserDefaults.standard.set(true, forKey: "registrationstatus") @@ -497,7 +499,7 @@ class HyberAPI { //for send delivery report to hyber server func hyber_message_dr(message_Id: String, received_At: String, X_Hyber_Session_Id: String, X_Hyber_Auth_Token:String)->HyberGeneralAnswerStruct { do{ - if (message_Id != nil && message_Id != "" && message_Id != "[]" ) { + if (message_Id != "" && message_Id != "[]" ) { let procedure_name = "hyber_message_dr" let configuration = URLSessionConfiguration .default let session = URLSession(configuration: configuration) @@ -538,8 +540,8 @@ class HyberAPI { request.addValue(String(timet), forHTTPHeaderField: "X-Hyber-Timestamp") request.addValue(sha256_auth_token, forHTTPHeaderField: "X-Hyber-Auth-Token") - print(request.allHTTPHeaderFields) - print(request.httpBody) + print(request.allHTTPHeaderFields as Any) + print(request.httpBody as Any) request.httpBody = try! JSONSerialization.data(withJSONObject: params, options: []) @@ -560,15 +562,15 @@ class HyberAPI { answ = self.answer_buider.general_answer_struct(resp_code: String(httpResponse.statusCode), body_json: body_json, description: "Success") - self.processor.file_logger(message: "\(procedure_name) response jsonData is \(jsonData)", loglevel: ".debug") + self.processor.file_logger(message: "\(procedure_name) response jsonData is \(String(describing: jsonData))", loglevel: ".debug") self.processor.file_logger(message: "\(procedure_name) response code is \(httpResponse.statusCode)", loglevel: ".debug") - self.processor.file_logger(message: "\(procedure_name) response data is \(data)", loglevel: ".debug") + self.processor.file_logger(message: "\(procedure_name) response data is \(String(describing: data))", loglevel: ".debug") self.processor.file_logger(message: "\(procedure_name) response debugDescription is \(httpResponse.debugDescription)", loglevel: ".debug") print(httpResponse.statusCode) - print(jsonData) + print(jsonData as Any) switch (httpResponse.statusCode) { @@ -579,7 +581,7 @@ class HyberAPI { if response == "SUCCESS" { - self.processor.file_logger(message: "\(procedure_name) success response body is \(response)", loglevel: ".debug") } + self.processor.file_logger(message: "\(procedure_name) success response body is \(String(describing: response))", loglevel: ".debug") } case 401: Constants.registrationstatus = false @@ -602,7 +604,6 @@ class HyberAPI { print("invalid regex: \(error.localizedDescription)") return answer_b.general_answer_struct(resp_code: "710", body_json: "error", description: "Critical error") } - } //6 procedure @@ -615,9 +616,8 @@ class HyberAPI { let semaphore2 = DispatchSemaphore(value: 0) var answ: HyberGeneralAnswerStruct = HyberGeneralAnswerStruct.init(code: 0, result: "unknown", description: "unknown", body: "unknown") let params = [ - "messageId":message_Id, - "answer": answer - + "messageId": message_Id, + "answer": answer ] as Dictionary let urlString = NSString(format: Constants.url_Http_Mess_callback); processor.file_logger(message: "\(procedure_name) url string is \(urlString)", loglevel: ".debug") @@ -644,8 +644,8 @@ class HyberAPI { self.processor.file_logger(message: "\(procedure_name) request X-Hyber-Timestamp is \(String(timet))", loglevel: ".debug") request.addValue(String(timet), forHTTPHeaderField: "X-Hyber-Timestamp") request.addValue(sha256_auth_token, forHTTPHeaderField: "X-Hyber-Auth-Token") - print(request.allHTTPHeaderFields) - print(request.httpBody) + print(request.allHTTPHeaderFields as Any) + print(request.httpBody as Any) request.httpBody = try! JSONSerialization.data(withJSONObject: params, options: []) @@ -666,11 +666,11 @@ class HyberAPI { answ = self.answer_buider.general_answer_struct(resp_code: String(httpResponse.statusCode), body_json: body_json, description: "Success") - self.processor.file_logger(message: "\(procedure_name) response jsonData is \(jsonData)", loglevel: ".debug") + self.processor.file_logger(message: "\(procedure_name) response jsonData is \(String(describing: jsonData))", loglevel: ".debug") self.processor.file_logger(message: "\(procedure_name) response code is \(httpResponse.statusCode)", loglevel: ".debug") - self.processor.file_logger(message: "\(procedure_name) response data is \(data)", loglevel: ".debug") + self.processor.file_logger(message: "\(procedure_name) response data is \(String(describing: data))", loglevel: ".debug") self.processor.file_logger(message: "\(procedure_name) response debugDescription is \(httpResponse.debugDescription)", loglevel: ".debug") @@ -682,12 +682,12 @@ class HyberAPI { let response = NSString (data: receivedData, encoding: String.Encoding.utf8.rawValue) - print(jsonData) + print(jsonData as Any) if response == "SUCCESS" { - self.processor.file_logger(message: "\(procedure_name) success response body is \(response)", loglevel: ".debug") } + self.processor.file_logger(message: "\(procedure_name) success response body is \(String(describing: response))", loglevel: ".debug") } case 401: Constants.registrationstatus = false @@ -723,7 +723,6 @@ class HyberAPI { let procedure_name = "hyber_device_get_all" let configuration = URLSessionConfiguration .default let session = URLSession(configuration: configuration) - var dict:NSDictionary! let semaphore = DispatchSemaphore(value: 0) @@ -786,7 +785,7 @@ class HyberAPI { - if let userInfo = jsonData as? NSDictionary { + if let userInfo = jsonData as NSDictionary? { let test = userInfo["devices"] if let userInfo2 = test as? NSDictionary { @@ -808,7 +807,7 @@ class HyberAPI { self.processor.file_logger(message: "\(procedure_name) response code is \(httpResponse.statusCode)", loglevel: ".debug") - self.processor.file_logger(message: "\(procedure_name) response data is \(data)", loglevel: ".debug") + self.processor.file_logger(message: "\(procedure_name) response data is \(String(describing: data))", loglevel: ".debug") self.processor.file_logger(message: "\(procedure_name) response debugDescription is \(httpResponse.debugDescription)", loglevel: ".debug") @@ -824,7 +823,7 @@ class HyberAPI { if response == "SUCCESS" { - self.processor.file_logger(message: "\(procedure_name) success response body is \(response)", loglevel: ".debug") } + self.processor.file_logger(message: "\(procedure_name) success response body is \(String(describing: response))", loglevel: ".debug") } case 401: Constants.registrationstatus = false @@ -865,7 +864,7 @@ class HyberAPI { //print(messs) - var messs2 = ["message": queue_answer as AnyObject] as! [String: AnyObject] + let messs2 = ["message": queue_answer as AnyObject] as! [String: AnyObject] NotificationCenter.default.post(name: .didReceiveData, object: nil, userInfo: messs2 ) hyber_message_dr(message_Id: i, received_At: "123123122341", X_Hyber_Session_Id: X_Hyber_Session_Id, X_Hyber_Auth_Token: X_Hyber_Auth_Token) @@ -952,8 +951,8 @@ class HyberAPI { self.processor.file_logger(message: "\(procedure_name) request X-Hyber-Timestamp is \(String(timet))", loglevel: ".debug") request.addValue(String(timet), forHTTPHeaderField: "X-Hyber-Timestamp") request.addValue(sha256_auth_token, forHTTPHeaderField: "X-Hyber-Auth-Token") - print(request.allHTTPHeaderFields) - print(request.httpBody) + print(request.allHTTPHeaderFields as Any) + print(request.httpBody as Any) request.httpBody = try! JSONSerialization.data(withJSONObject: params, options: []) @@ -974,11 +973,11 @@ class HyberAPI { answ = self.answer_buider.general_answer2(resp_code: httpResponse.statusCode, body_json: body_json, description: "Success") - self.processor.file_logger(message: "\(procedure_name) response jsonData is \(jsonData)", loglevel: ".debug") + self.processor.file_logger(message: "\(procedure_name) response jsonData is \(String(describing: jsonData))", loglevel: ".debug") self.processor.file_logger(message: "\(procedure_name) response code is \(httpResponse.statusCode)", loglevel: ".debug") - self.processor.file_logger(message: "\(procedure_name) response data is \(data)", loglevel: ".debug") + self.processor.file_logger(message: "\(procedure_name) response data is \(String(describing: data))", loglevel: ".debug") self.processor.file_logger(message: "\(procedure_name) response debugDescription is \(httpResponse.debugDescription)", loglevel: ".debug") @@ -992,9 +991,9 @@ class HyberAPI { - print(jsonData) + print(jsonData as Any) - let dataa = response as! String + let dataa = response! as String print(self.messidParse(queue_answer: dataa, X_Hyber_Session_Id: X_Hyber_Session_Id, X_Hyber_Auth_Token: X_Hyber_Auth_Token)) @@ -1002,7 +1001,7 @@ class HyberAPI { if response == "SUCCESS" { - self.processor.file_logger(message: "\(procedure_name) success response body is \(response)", loglevel: ".debug") } + self.processor.file_logger(message: "\(procedure_name) success response body is \(String(describing: response))", loglevel: ".debug") } case 401: Constants.registrationstatus = false diff --git a/HyberSDK/logger/Formatters.swift b/HyberSDK/logger/Formatters.swift index 19a488f..b4ea28f 100755 --- a/HyberSDK/logger/Formatters.swift +++ b/HyberSDK/logger/Formatters.swift @@ -2,7 +2,7 @@ // Formatters.swift // Hyber-SDK // -// Created by Taras on 10/27/16. +// Created by Kirill Kotov on 10/27/16. // Incuube // import Foundation diff --git a/HyberSDK/logger/Themes.swift b/HyberSDK/logger/Themes.swift index 59a329c..393f31d 100755 --- a/HyberSDK/logger/Themes.swift +++ b/HyberSDK/logger/Themes.swift @@ -2,7 +2,7 @@ // Themes.swift // Hyber-SDK // -// Created by Taras on 10/27/16. +// Created by Kirill Kotov on 10/27/16. // Incuube // diff --git a/HyberSDK/logger/Utilities.swift b/HyberSDK/logger/Utilities.swift index 3dfcb1f..a5fe7b7 100755 --- a/HyberSDK/logger/Utilities.swift +++ b/HyberSDK/logger/Utilities.swift @@ -2,7 +2,7 @@ // Utilities.swift // Hyber-SDK // -// Created by Taras on 10/27/16. +// Created by Kirill Kotov on 10/27/16. // Incuube // diff --git a/HyberSDK/settings/add_functions.swift b/HyberSDK/settings/add_functions.swift index 7a17519..1765d5c 100644 --- a/HyberSDK/settings/add_functions.swift +++ b/HyberSDK/settings/add_functions.swift @@ -2,7 +2,7 @@ // add_functions.swift // test222 // -// Created by ard on 28/04/2019. +// Created by Kirill Kotov on 28/04/2019. // Copyright © 2019 ard. All rights reserved. // @@ -14,8 +14,6 @@ public class Processing { //function for write debug log into additional file. Calling from procedures func file_logger(message: String, loglevel: String){ - do - { if (Constants.loglevel==".debug") { log_wr(message: message, loglevel: loglevel) }else if (Constants.loglevel==".errors" && (loglevel==".error" || loglevel==".critical") ){ @@ -25,9 +23,6 @@ public class Processing { }else{ //if another level in loglevel } - } catch let error as String { - log_wr(message: error, loglevel: ".error") - } } private func log_wr(message: String, loglevel: String){ @@ -41,7 +36,6 @@ public class Processing { } public func matches(for regex: String, in text: String) -> [String] { - do { let regex = try NSRegularExpression(pattern: regex) let results = regex.matches(in: text, diff --git a/HyberSDK/settings/hyber_answer_func.swift b/HyberSDK/settings/hyber_answer_func.swift index aa62f12..e5869ce 100644 --- a/HyberSDK/settings/hyber_answer_func.swift +++ b/HyberSDK/settings/hyber_answer_func.swift @@ -2,7 +2,7 @@ // hyber_answer_func.swift // PushDemo // -// Created by ard on 28/09/2019. +// Created by Kirill Kotov on 28/09/2019. // Copyright © 2019 ard. All rights reserved. // @@ -32,7 +32,6 @@ class AnswerBuider { resp = HyberGeneralAnswerStruct.init(code: Int(resp_code)!, result: "Failed", description: "Failed", body: body_json) } - return resp } diff --git a/HyberSDK/settings/json_parser.swift b/HyberSDK/settings/json_parser.swift index 30cbc3d..b5b45b0 100644 --- a/HyberSDK/settings/json_parser.swift +++ b/HyberSDK/settings/json_parser.swift @@ -2,7 +2,7 @@ // json_parser.swift // HyberSDK // -// Created by Дмитрий Буйновский on 29/03/2020. +// Created by Kirill Kotov on 29/03/2020. // Copyright © 2020 GMS. All rights reserved. // diff --git a/HyberSDK/settings/params.swift b/HyberSDK/settings/params.swift index a15ef8c..4a04416 100644 --- a/HyberSDK/settings/params.swift +++ b/HyberSDK/settings/params.swift @@ -1,8 +1,6 @@ // -// params.swift -// test222 // -// Created by ard on 28/04/2019. +// Created by Kirill Kotov on 28/04/2019. // Copyright © 2019 ard. All rights reserved. // @@ -109,6 +107,53 @@ public struct HyberGeneralAnswerStruct { public var body: String } + +public struct PushSdkParametersPublic { + + public struct BranchStructObj { + var fun_hyber_url_device_update: String + var fun_hyber_url_registration: String + var fun_hyber_url_revoke: String + var fun_hyber_url_get_device_all: String + var fun_hyber_url_message_callback: String + var fun_hyber_url_message_dr: String + var fun_hyber_url_mess_queue: String + var hyber_url_message_history: String + } + + var BranchStructObj = branchMasterValue.self + + //public val branchMasterValue: BranchStructObj = BranchStructObj() + + + public struct branchMasterValue { + static let fun_hyber_url_device_update = "https://push.hyber.im/api/2.3/device/update" + static let fun_hyber_url_registration = "https://push.hyber.im/api/2.3/device/registration" + static let fun_hyber_url_revoke = "https://push.hyber.im/api/2.3/device/revoke" + static let fun_hyber_url_get_device_all = "https://push.hyber.im/api/2.3/device/all" + static let fun_hyber_url_message_callback = "https://push.hyber.im/api/2.3/message/callback" + static let fun_hyber_url_message_dr = "https://push.hyber.im/api/2.3/message/dr" + static let fun_hyber_url_mess_queue = "https://push.hyber.im/api/2.3/message/queue" + static let hyber_url_message_history = "https://push.hyber.im/api/2.3/message/history?startDate=" + } + + public struct branchTestValue { + static let fun_hyber_url_device_update = "https://test-push.hyber.im/api/2.3/device/update" + static let fun_hyber_url_registration = "https://test-push.hyber.im/api/2.3/device/registration" + static let fun_hyber_url_revoke = "https://test-push.hyber.im/api/2.3/device/revoke" + static let fun_hyber_url_get_device_all = "https://test-push.hyber.im/api/2.3/device/all" + static let fun_hyber_url_message_callback = "https://test-push.hyber.im/api/2.3/message/callback" + static let fun_hyber_url_message_dr = "https://test-push.hyber.im/api/2.3/message/dr" + static let fun_hyber_url_mess_queue = "https://test-push.hyber.im/api/2.3/message/queue" + static let hyber_url_message_history = "https://test-push.hyber.im/api/2.3/message/history?startDate=" + } + + static let TAG_LOGGING = "HyberPushSDK" + static let hyber_log_level_error = "error" + static let hyber_log_level_debug = "debug" +} + + public struct Constants { public static var registrationstatus = UserDefaults.standard.bool(forKey: "registrationstatus") @@ -123,7 +168,6 @@ public struct Constants { - let kOSType = "ios" static let sdkVersion = "0.0.12" static let dev_os_Version = UIDevice.current.systemVersion @@ -266,6 +310,10 @@ public extension UIDevice { case "iPhone11,2": return "iPhone XS" case "iPhone11,4", "iPhone11,6": return "iPhone XS Max" case "iPhone11,8": return "iPhone XR" + case "iPhone12,1": return "iPhone 11" + case "iPhone12,3": return "iPhone 11 Pro" + case "iPhone12,5": return "iPhone 11 Pro Max" + case "iPhone12,8": return "iPhone SE (2nd generation)" case "iPad2,1", "iPad2,2", "iPad2,3", "iPad2,4":return "iPad 2" case "iPad3,1", "iPad3,2", "iPad3,3": return "iPad 3" case "iPad3,4", "iPad3,5", "iPad3,6": return "iPad 4" @@ -285,6 +333,7 @@ public extension UIDevice { case "iPad7,3", "iPad7,4": return "iPad Pro (10.5-inch)" case "iPad8,1", "iPad8,2", "iPad8,3", "iPad8,4":return "iPad Pro (11-inch)" case "iPad8,5", "iPad8,6", "iPad8,7", "iPad8,8":return "iPad Pro (12.9-inch) (3rd generation)" + case "iPad8,11", "iPad8,12": return "iPad Pro (12.9-inch) (4th generation)" case "AppleTV5,3": return "Apple TV" case "AppleTV6,2": return "Apple TV 4K" case "AudioAccessory1,1": return "HomePod" diff --git a/HyberSDKTests/HyberSDKTests.swift b/HyberSDKTests/HyberSDKTests.swift index b0c061f..ecaacdf 100644 --- a/HyberSDKTests/HyberSDKTests.swift +++ b/HyberSDKTests/HyberSDKTests.swift @@ -1,15 +1,17 @@ // -// Hyber_SDK_iOSTests.swift -// Hyber-SDK-iOSTests +// HyberSDKTests.swift +// HyberSDKTests // -// Created by Дмитрий Буйновский on 24/11/2019. -// Copyright © 2019 GMS. All rights reserved. +// Created by Kirill Kotov on 01/10/2020. +// Copyright © 2020 HYBER. All rights reserved. // import XCTest -@testable import Hyber_SDK_iOS +@testable import HyberSDK -class Hyber_SDK_iOSTests: XCTestCase { +class HyberSDKTests: XCTestCase { + + var sdkInitHyber = HyberSDK.init() override func setUp() { // Put setup code here. This method is called before the invocation of each test method in the class. @@ -30,5 +32,13 @@ class Hyber_SDK_iOSTests: XCTestCase { // Put the code you want to measure the time of here. } } + + //func testRegistrar() { + // sdkInitHyber.hyber_register_new(user_phone: "375291234567", user_password: "Password", x_hyber_sesion_id: "123", x_hyber_ios_bundle_id: "test", X_Hyber_Client_API_Key: "test") + // } + + func testPrint() { + print("error: not a valid http response") + } } diff --git a/Podfile b/Podfile index 54d3ec5..c19f4fe 100644 --- a/Podfile +++ b/Podfile @@ -5,8 +5,7 @@ target 'HyberSDK' do # Comment the next line if you don't want to use dynamic frameworks use_frameworks! - # Pods for Hyber-SDK-iOS - pod 'SwiftyJSON', '~> 4.0' + # Pods for HyberSDK #pod 'Firebase/Core' #pod 'Firebase/Messaging' #pod 'Firebase/Auth' @@ -18,10 +17,25 @@ target 'HyberSDK' do pod 'BoringSSL-GRPC' pod 'CryptoSwift', '1.0.0' pod 'JSON' + pod 'RetrofireSwift' + pod 'SwiftyBeaver' target 'HyberSDKTests' do inherit! :search_paths # Pods for testing + #pod 'Firebase/Core' + #pod 'Firebase/Messaging' + #pod 'Firebase/Auth' + #pod 'Firebase/AdMob' + #pod 'Firebase/Database' + #pod 'Firebase/Storage' + #pod 'Firebase/Firestore' + #pod 'Google-Mobile-Ads-SDK' + pod 'BoringSSL-GRPC' + pod 'CryptoSwift', '1.0.0' + pod 'JSON' + pod 'RetrofireSwift' + pod 'SwiftyBeaver' end end diff --git a/Podfile.lock b/Podfile.lock index 0452b94..ac663ee 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,33 +1,45 @@ PODS: - - BoringSSL-GRPC (0.0.4): - - BoringSSL-GRPC/Implementation (= 0.0.4) - - BoringSSL-GRPC/Interface (= 0.0.4) - - BoringSSL-GRPC/Implementation (0.0.4): - - BoringSSL-GRPC/Interface (= 0.0.4) - - BoringSSL-GRPC/Interface (0.0.4) + - Alamofire (5.0.5) + - BoringSSL-GRPC (0.0.7): + - BoringSSL-GRPC/Implementation (= 0.0.7) + - BoringSSL-GRPC/Interface (= 0.0.7) + - BoringSSL-GRPC/Implementation (0.0.7): + - BoringSSL-GRPC/Interface (= 0.0.7) + - BoringSSL-GRPC/Interface (0.0.7) - CryptoSwift (1.0.0) - JSON (5.0.0) - - SwiftyJSON (4.3.0) + - RetrofireSwift (0.3.4): + - Alamofire + - SourceryForRetrofire (= 0.16.0-sfr-6) + - SourceryForRetrofire (0.16.0-sfr-6) + - SwiftyBeaver (1.8.4) DEPENDENCIES: - BoringSSL-GRPC - CryptoSwift (= 1.0.0) - JSON - - SwiftyJSON (~> 4.0) + - RetrofireSwift + - SwiftyBeaver SPEC REPOS: https://github.com/cocoapods/specs.git: + - Alamofire - BoringSSL-GRPC - CryptoSwift - JSON - - SwiftyJSON + - RetrofireSwift + - SourceryForRetrofire + - SwiftyBeaver SPEC CHECKSUMS: - BoringSSL-GRPC: b8d2e9fca6d3870aec81ee7d583869caec2a6076 + Alamofire: df2f8f826963b08b9a870791ad48e07a10090b2e + BoringSSL-GRPC: 8edf627ee524575e2f8d19d56f068b448eea3879 CryptoSwift: d81eeaa59dc5a8d03720fe919a6fd07b51f7439f JSON: 93622160a062588b4cd3497b77ccd777f1fd0587 - SwiftyJSON: 6faa0040f8b59dead0ee07436cbf76b73c08fd08 + RetrofireSwift: 4c3611bd341af957c7ffbd1c24ac93ee5af496fd + SourceryForRetrofire: 1430840a10403d89165b29543a64f4c979278f4a + SwiftyBeaver: f9a9aba96a6a6166e21682377804d728b0d20b95 -PODFILE CHECKSUM: ff56b1e90e94c78262faf39167a8d0ed7977efad +PODFILE CHECKSUM: bd08a5afac91a4c04e3f41ce70c66a705271b1db COCOAPODS: 1.7.0