Skip to content

Commit a4b1634

Browse files
mariuscmariusc
authored
Merge pull request #68 from nstack-io/develop
Develop
2 parents d5664a2 + 07f291a commit a4b1634

16 files changed

Lines changed: 143 additions & 66 deletions

‎NStackSDK.podspec‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#
2+
# Be sure to run `pod lib lint TuvaUI.podspec' to ensure this is a
3+
# valid spec before submitting.
4+
#
5+
# Any lines starting with a # are optional, but their use is encouraged
6+
# To learn more about a Podspec see https://guides.cocoapods.org/syntax/podspec.html
7+
#
8+
9+
Pod::Spec.new do |s|
10+
s.name = 'NStackSDK'
11+
s.version = '5.1.3'
12+
s.summary = 'NStackSDK is the companion software development kit to the NStack backend.'
13+
14+
# This description is used to generate tags and improve search results.
15+
# * Think: What does it do? Why did you write it? What is the focus?
16+
# * Try to keep it short, snappy and to the point.
17+
# * Write the description between the DESC delimiters below.
18+
# * Finally, don't worry about the indent, CocoaPods strips it!
19+
s.description = <<-DESC
20+
NStack is Nodes\' "Backend as a Service" product that enables clients to manage many aspects of their products by themselves.
21+
DESC
22+
23+
s.homepage = 'https://github.com/nstack-io/nstack-ios-sdk'
24+
s.license = { :type => "MIT", :file => "LICENSE" }
25+
s.author = { "Nodes Agency - iOS" => "ios@nodes.dk" }
26+
s.source = { :git => 'https://github.com/nstack-io/nstack-ios-sdk', :tag => s.version.to_s }
27+
28+
s.ios.deployment_target = "11"
29+
s.swift_version = '5.2'
30+
31+
s.default_subspecs = "Core"
32+
s.dependency 'NLocalizationManager'
33+
34+
s.subspec 'Core' do |core|
35+
core.source_files = [ 'NStackSDK/**/*.swift']
36+
end
37+
end

‎NStackSDK.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,8 @@
9393
2346FDA2233B6BC40025B68D /* Countries.json in Resources */ = {isa = PBXBuildFile; fileRef = 2346FD6D233B65400025B68D /* Countries.json */; };
9494
2346FDA3233B6C680025B68D /* Countries.json in Resources */ = {isa = PBXBuildFile; fileRef = 2346FD6D233B65400025B68D /* Countries.json */; };
9595
23BD95C322CD00DB001759CE /* AppOpenMockRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23BD95C222CD00DB001759CE /* AppOpenMockRepository.swift */; };
96-
2909463824211DEF00BA254F /* LocalizationManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29A72DF623FFECE500CE8483 /* LocalizationManager.framework */; };
9796
29A72DF023FFEC9600CE8483 /* LocalizationManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29A72DEF23FFEC9600CE8483 /* LocalizationManager.framework */; };
9897
29A72DF323FFECD700CE8483 /* LocalizationManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29A72DF223FFECD700CE8483 /* LocalizationManager.framework */; };
99-
29A72DF723FFECE500CE8483 /* LocalizationManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29A72DF623FFECE500CE8483 /* LocalizationManager.framework */; };
10098
29A72DFB23FFECED00CE8483 /* LocalizationManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29A72DFA23FFECED00CE8483 /* LocalizationManager.framework */; };
10199
29A72DFF24000DFD00CE8483 /* LocalizationConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29A72DFE24000DFD00CE8483 /* LocalizationConfig.swift */; };
102100
29A72E002400166400CE8483 /* LocalizationConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29A72DFE24000DFD00CE8483 /* LocalizationConfig.swift */; };
@@ -186,6 +184,8 @@
186184
A83A140922F2CB5C002A7682 /* SectionKeyHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = A83A140822F2CB5C002A7682 /* SectionKeyHelper.swift */; };
187185
A864BBEC22F31AD200CC2BFF /* LocalizationItemIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = A864BBEB22F31AD200CC2BFF /* LocalizationItemIdentifier.swift */; };
188186
A8ECFA3022F44E2D009D2175 /* ProposalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8ECFA2E22F44E2D009D2175 /* ProposalViewController.swift */; };
187+
B4369B1D242A1A8800156B68 /* LocalizationManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4369B1C242A1A8800156B68 /* LocalizationManager.framework */; };
188+
B4369B1E242A1A8800156B68 /* LocalizationManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4369B1C242A1A8800156B68 /* LocalizationManager.framework */; };
189189
C0D852CE215A2C390090B7C5 /* Codable+Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0D852CD215A2C390090B7C5 /* Codable+Dictionary.swift */; };
190190
C0D852CF215A2C390090B7C5 /* Codable+Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0D852CD215A2C390090B7C5 /* Codable+Dictionary.swift */; };
191191
C0D852D0215A2C390090B7C5 /* Codable+Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0D852CD215A2C390090B7C5 /* Codable+Dictionary.swift */; };
@@ -327,7 +327,6 @@
327327
23BD95C222CD00DB001759CE /* AppOpenMockRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppOpenMockRepository.swift; sourceTree = "<group>"; };
328328
29A72DEF23FFEC9600CE8483 /* LocalizationManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LocalizationManager.framework; path = Carthage/Build/Mac/LocalizationManager.framework; sourceTree = "<group>"; };
329329
29A72DF223FFECD700CE8483 /* LocalizationManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LocalizationManager.framework; path = Carthage/Build/iOS/LocalizationManager.framework; sourceTree = "<group>"; };
330-
29A72DF623FFECE500CE8483 /* LocalizationManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LocalizationManager.framework; path = Carthage/Build/tvOS/LocalizationManager.framework; sourceTree = "<group>"; };
331330
29A72DFA23FFECED00CE8483 /* LocalizationManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LocalizationManager.framework; path = Carthage/Build/watchOS/LocalizationManager.framework; sourceTree = "<group>"; };
332331
29A72DFE24000DFD00CE8483 /* LocalizationConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizationConfig.swift; sourceTree = "<group>"; };
333332
29D7EB5223FAB71900C622EA /* TranslationManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TranslationManager.framework; path = Carthage/Build/iOS/TranslationManager.framework; sourceTree = "<group>"; };
@@ -348,7 +347,6 @@
348347
33E222ED1FA8C5280013CCC3 /* Validation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Validation.swift; path = Classes/Model/Validation.swift; sourceTree = "<group>"; };
349348
33E223021FA9F4EA0013CCC3 /* IPAddress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = IPAddress.swift; path = Classes/Model/IPAddress.swift; sourceTree = "<group>"; };
350349
33E2230A1FA9F5010013CCC3 /* Continent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Continent.swift; path = Classes/Model/Continent.swift; sourceTree = "<group>"; };
351-
7579C77123C346CE00A05022 /* APIFeedbackManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIFeedbackManager.swift; sourceTree = "<group>"; };
352350
82CB55491C8DEAC200389D2B /* AppOpenResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppOpenResponse.swift; path = Classes/Model/AppOpenResponse.swift; sourceTree = "<group>"; };
353351
82CB554A1C8DEAC200389D2B /* LanguageData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LanguageData.swift; path = Classes/Model/LanguageData.swift; sourceTree = "<group>"; };
354352
839497BE1DC21DBF007FE281 /* Country.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Country.swift; path = Classes/Model/Country.swift; sourceTree = "<group>"; };
@@ -376,6 +374,8 @@
376374
A83A140822F2CB5C002A7682 /* SectionKeyHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SectionKeyHelper.swift; sourceTree = "<group>"; };
377375
A864BBEB22F31AD200CC2BFF /* LocalizationItemIdentifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizationItemIdentifier.swift; sourceTree = "<group>"; };
378376
A8ECFA2E22F44E2D009D2175 /* ProposalViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProposalViewController.swift; sourceTree = "<group>"; };
377+
B4369B1B242A19DF00156B68 /* NStackSDK.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = NStackSDK.podspec; sourceTree = "<group>"; };
378+
B4369B1C242A1A8800156B68 /* LocalizationManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LocalizationManager.framework; path = Carthage/Build/tvOS/LocalizationManager.framework; sourceTree = "<group>"; };
379379
C0D852CD215A2C390090B7C5 /* Codable+Dictionary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Codable+Dictionary.swift"; sourceTree = "<group>"; };
380380
C0D852D7215A373F0090B7C5 /* Routes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Routes.swift; sourceTree = "<group>"; };
381381
C0D852E2215A42EE0090B7C5 /* URLSession+Request.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URLSession+Request.swift"; sourceTree = "<group>"; };
@@ -426,7 +426,7 @@
426426
isa = PBXFrameworksBuildPhase;
427427
buildActionMask = 2147483647;
428428
files = (
429-
29A72DF723FFECE500CE8483 /* LocalizationManager.framework in Frameworks */,
429+
B4369B1D242A1A8800156B68 /* LocalizationManager.framework in Frameworks */,
430430
E3689BF91D9EBA14004620D6 /* Foundation.framework in Frameworks */,
431431
E3689BFA1D9EBA14004620D6 /* UIKit.framework in Frameworks */,
432432
);
@@ -437,7 +437,7 @@
437437
buildActionMask = 2147483647;
438438
files = (
439439
E3689BEB1D9EB9EB004620D6 /* NStackSDK.framework in Frameworks */,
440-
2909463824211DEF00BA254F /* LocalizationManager.framework in Frameworks */,
440+
B4369B1E242A1A8800156B68 /* LocalizationManager.framework in Frameworks */,
441441
);
442442
runOnlyForDeploymentPostprocessing = 0;
443443
};
@@ -572,7 +572,6 @@
572572
29A72DD023FAC8A000CE8483 /* Recovered References */ = {
573573
isa = PBXGroup;
574574
children = (
575-
7579C77123C346CE00A05022 /* APIFeedbackManager.swift */,
576575
29D7EB5223FAB71900C622EA /* TranslationManager.framework */,
577576
);
578577
name = "Recovered References";
@@ -611,8 +610,8 @@
611610
children = (
612611
29A72DEF23FFEC9600CE8483 /* LocalizationManager.framework */,
613612
29A72DF223FFECD700CE8483 /* LocalizationManager.framework */,
614-
29A72DF623FFECE500CE8483 /* LocalizationManager.framework */,
615613
29A72DFA23FFECED00CE8483 /* LocalizationManager.framework */,
614+
B4369B1C242A1A8800156B68 /* LocalizationManager.framework */,
616615
83100E952333B13C00F84217 /* watchOS */,
617616
83100E942333B13600F84217 /* macOS */,
618617
83100E932333B13100F84217 /* tvOS */,
@@ -625,6 +624,7 @@
625624
30A3D83D1B9DB94100C2D15C = {
626625
isa = PBXGroup;
627626
children = (
627+
B4369B1B242A19DF00156B68 /* NStackSDK.podspec */,
628628
30A3D8491B9DB94100C2D15C /* NStackSDK */,
629629
30A3D8551B9DB94100C2D15C /* NStackSDK Tests */,
630630
304C42851BA074CB00AE3D6F /* Frameworks */,
@@ -1563,7 +1563,7 @@
15631563
ONLY_ACTIVE_ARCH = YES;
15641564
SDKROOT = iphoneos;
15651565
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1566-
SWIFT_VERSION = 4.2;
1566+
SWIFT_VERSION = 5.0;
15671567
TARGETED_DEVICE_FAMILY = "1,2";
15681568
TVOS_DEPLOYMENT_TARGET = 9.0;
15691569
VERSIONING_SYSTEM = "apple-generic";
@@ -1619,7 +1619,7 @@
16191619
LD_RUNPATH_SEARCH_PATHS = "";
16201620
MTL_ENABLE_DEBUG_INFO = NO;
16211621
SDKROOT = iphoneos;
1622-
SWIFT_VERSION = 4.2;
1622+
SWIFT_VERSION = 5.0;
16231623
TARGETED_DEVICE_FAMILY = "1,2";
16241624
TVOS_DEPLOYMENT_TARGET = 9.0;
16251625
VALIDATE_PRODUCT = YES;
@@ -1659,7 +1659,6 @@
16591659
STRIP_INSTALLED_PRODUCT = NO;
16601660
SUPPORTS_MACCATALYST = NO;
16611661
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1662-
SWIFT_VERSION = 5.0;
16631662
};
16641663
name = Debug;
16651664
};
@@ -1694,7 +1693,6 @@
16941693
SUPPORTS_MACCATALYST = NO;
16951694
SWIFT_COMPILATION_MODE = wholemodule;
16961695
SWIFT_OPTIMIZATION_LEVEL = "-O";
1697-
SWIFT_VERSION = 5.0;
16981696
};
16991697
name = Release;
17001698
};
@@ -1787,7 +1785,6 @@
17871785
SDKROOT = appletvos;
17881786
SKIP_INSTALL = YES;
17891787
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1790-
SWIFT_VERSION = 5.0;
17911788
TARGETED_DEVICE_FAMILY = 3;
17921789
TVOS_DEPLOYMENT_TARGET = 10.2;
17931790
};
@@ -1824,7 +1821,6 @@
18241821
SKIP_INSTALL = YES;
18251822
SWIFT_COMPILATION_MODE = wholemodule;
18261823
SWIFT_OPTIMIZATION_LEVEL = "-O";
1827-
SWIFT_VERSION = 5.0;
18281824
TARGETED_DEVICE_FAMILY = 3;
18291825
TVOS_DEPLOYMENT_TARGET = 10.2;
18301826
};

‎NStackSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎NStackSDK/APIFeedbackManager.swift‎

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

‎NStackSDK/Classes/Managers/GeographyManager.swift‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ import Foundation
1010
#if os(iOS)
1111
import UIKit
1212
#endif
13+
#if canImport(LocalizationManager)
1314
import LocalizationManager
15+
#endif
16+
#if canImport(NLocalizationManager)
17+
import NLocalizationManager
18+
#endif
1419

1520
public class GeographyManager {
1621

‎NStackSDK/Classes/Model/AppOpenData.swift‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@ import AppKit
1212
#else
1313
import UIKit
1414
#endif
15+
#if canImport(LocalizationManager)
1516
import LocalizationManager
17+
#endif
18+
#if canImport(NLocalizationManager)
19+
import NLocalizationManager
20+
#endif
21+
1622

1723
struct AppOpenData: Codable {
1824
let count: Int?

‎NStackSDK/Classes/Model/Configuration.swift‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ import AppKit
1212
#else
1313
import UIKit
1414
#endif
15+
#if canImport(LocalizationManager)
1516
import LocalizationManager
17+
#endif
18+
#if canImport(NLocalizationManager)
19+
import NLocalizationManager
20+
#endif
1621

1722
public struct UpdateOptions: OptionSet {
1823
public let rawValue: Int

‎NStackSDK/Classes/Model/LocalizationItemProposal.swift‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@ import AppKit
1212
#else
1313
import UIKit
1414
#endif
15+
#if canImport(LocalizationManager)
1516
import LocalizationManager
17+
#endif
18+
#if canImport(NLocalizationManager)
19+
import NLocalizationManager
20+
#endif
21+
1622

1723
struct LocalizationItemProposal {
1824
let value: String

‎NStackSDK/Classes/Model/LocalizationsResponse.swift‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ import AppKit
1212
#else
1313
import UIKit
1414
#endif
15+
#if canImport(LocalizationManager)
1516
import LocalizationManager
17+
#endif
18+
#if canImport(NLocalizationManager)
19+
import NLocalizationManager
20+
#endif
1621

1722
public struct LocalizationsResponse: Codable {
1823
let localization: [String: Any]

‎NStackSDK/Classes/NStack Manager/ConnectionManager.swift‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ import AppKit
1212
#else
1313
import UIKit
1414
#endif
15+
#if canImport(LocalizationManager)
1516
import LocalizationManager
17+
#endif
18+
#if canImport(NLocalizationManager)
19+
import NLocalizationManager
20+
#endif
1621

1722
struct DataModel<T: Codable>: WrapperModelType {
1823
let model: T

0 commit comments

Comments
 (0)