Merge pull request #41 from ppraveentr/_bugfix/Xcode12Update

Updated to fix Xcode12 warnings.
ppraveentr · Dec 11, 2020 · d9d36ea · d9d36ea
2 parents ad89ce2 + 656ede6
commit d9d36ea
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 43 deletions.
diff --git a/CoreUI/Classes/CustomComponents/FTView.swift b/CoreUI/Classes/CustomComponents/FTView.swift
@@ -28,13 +28,13 @@ open class FTView: UIView {
 
     @IBOutlet
     public var mainPinnedView: UIView! {
+        get {
+            localMainPinnedView
+        }
         set {
             localMainPinnedView = newValue
             self.restConstraints()
         }
-        get {
-            localMainPinnedView
-        }
     }
 
     @IBOutlet

diff --git a/CoreUI/Classes/FontPicker/FontPickerView.swift b/CoreUI/Classes/FontPicker/FontPickerView.swift
@@ -101,13 +101,13 @@ open class FontPickerView: UIView {
     }
 
     var selectedFont: String? {
+        get {
+            fontPickerModel.fontFamily
+        }
         set {
             fontPickerModel.fontFamily = newValue
             pickerDelegate?.fontFamily(newValue)
         }
-        get {
-            fontPickerModel.fontFamily
-        }
     }
 
     // Avaialble Fonts

diff --git a/CoreUI/Classes/FontPicker/FontPickerViewController.swift b/CoreUI/Classes/FontPicker/FontPickerViewController.swift
@@ -19,14 +19,14 @@ open class FontPickerViewController: UIViewController {
     }
 
     open var fontPickerModel: FontPickerModel? {
+        get {
+            pickerView?.fontPickerModel
+        }
         set {
             if let model = newValue {
                 pickerView?.fontPickerModel = model
             }
         }
-        get {
-            pickerView?.fontPickerModel
-        }
     }
 
     override open func loadView() {

diff --git a/CoreUtility/Classes/Extensions/AttributedLabelProtocol.swift b/CoreUtility/Classes/Extensions/AttributedLabelProtocol.swift
@@ -112,12 +112,12 @@ extension UILabel: AttributedLabelProtocol {
     }
 
     public var htmlText: String {
-        set {
-            updateWithHtmlString(text: newValue)
-        }
         get {
             ""
         }
+        set {
+            updateWithHtmlString(text: newValue)
+        }
     }
 }
 

diff --git a/Example/MobileCoreExample.xcodeproj/project.pbxproj b/Example/MobileCoreExample.xcodeproj/project.pbxproj
@@ -519,7 +519,7 @@
 					Bundle,
 				);
 				LastSwiftUpdateCheck = 1030;
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1220;
 				ORGANIZATIONNAME = "Praveen Prabhakar";
 				TargetAttributes = {
 					D405058B24AC71E100B2E096 = {
@@ -860,7 +860,7 @@
 				DEVELOPMENT_TEAM = W6W48SVQX7;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = MobileCoreTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -887,7 +887,7 @@
 				DEVELOPMENT_TEAM = W6W48SVQX7;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = MobileCoreTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited)";
@@ -925,6 +925,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -950,7 +951,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_SWIFT_FLAGS = "-Onone";
@@ -989,6 +990,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1008,7 +1010,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_SWIFT_FLAGS = "";
 				SDKROOT = iphoneos;
@@ -1034,7 +1036,7 @@
 				DEVELOPMENT_TEAM = W6W48SVQX7;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "$(TARGET_NAME)/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MARKETING_VERSION = 0.1.0;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS";
@@ -1063,7 +1065,7 @@
 				DEVELOPMENT_TEAM = W6W48SVQX7;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "$(TARGET_NAME)/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MARKETING_VERSION = 0.1.0;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS";

diff --git a/Example/MobileCoreExample.xcodeproj/xcshareddata/xcschemes/MobileCoreExample.xcscheme b/Example/MobileCoreExample.xcodeproj/xcshareddata/xcschemes/MobileCoreExample.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1220"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Example/MobileCoreExample.xcodeproj/xcshareddata/xcschemes/MobileCoreExampleBundle.xcscheme b/Example/MobileCoreExample.xcodeproj/xcshareddata/xcschemes/MobileCoreExampleBundle.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Example/MobileCoreExample.xcodeproj/xcshareddata/xcschemes/MobileCoreTests.xcscheme b/Example/MobileCoreExample.xcodeproj/xcshareddata/xcschemes/MobileCoreTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1220"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -15,15 +15,6 @@
       codeCoverageEnabled = "YES"
       onlyGenerateCoverageForSpecifiedTargets = "YES"
       localizableStringsDataGatheringEnabled = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "DE9221C81EF28CDF000C8FC7"
-            BuildableName = "MobileCoreExample.app"
-            BlueprintName = "MobileCoreExample"
-            ReferencedContainer = "container:MobileCoreExample.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <AdditionalOptions>
          <AdditionalOption
             key = "MallocStackLogging"

diff --git a/Example/Podfile b/Example/Podfile
@@ -8,6 +8,7 @@ end
 target 'MobileCoreExample' do
    common_pods
    pod 'SwiftLint'
+   pod 'SwiftKeychainWrapper'
 end
 
 target 'MobileCoreTests' do

diff --git a/NetworkLayer/Classes/Cache/UserCacheManager.swift b/NetworkLayer/Classes/Cache/UserCacheManager.swift
@@ -93,13 +93,13 @@ public class UserCacheManager: UserCacheProtocol {
 
     // MARK: Session Headers
     public static var httpAdditionalHeaders: [String: String]? {
+        get {
+            UserCacheManager.getCachedObject(forKey: "sessnion.httpAdditionalHeaders", cacheType: .application) as? [String: String]
+        }
         set {
             let data = newValue
             UserCacheManager.setCacheObject(data as AnyObject, forKey: "sessnion.httpAdditionalHeaders", cacheType: .application)
         }
-        get {
-            UserCacheManager.getCachedObject(forKey: "sessnion.httpAdditionalHeaders", cacheType: .application) as? [String: String]
-        }
     }
 }
 

diff --git a/NetworkLayer/Classes/NetworkLayer/NetworkMananger.swift b/NetworkLayer/Classes/NetworkLayer/NetworkMananger.swift
@@ -26,12 +26,12 @@ public class NetworkMananger {
     fileprivate static var isMockDataModel: Bool = false
 
     public static var isMockData: Bool {
-        set {
-            isMockDataModel = newValue
-        }
         get {
             isMockDataModel && mockBundle != nil
         }
+        set {
+            isMockDataModel = newValue
+        }
     }
 
     // Stub data bundle, used by ServiceClient
@@ -71,12 +71,12 @@ public class NetworkMananger {
 
     // MARK: Logger
     public static var enableConsoleLogging: Bool {
-        set {
-            Logger.enableConsoleLogging = newValue
-        }
         get {
             Logger.enableConsoleLogging
         }
+        set {
+            Logger.enableConsoleLogging = newValue
+        }
     }
 
     // MARK: Init with Relection
@@ -89,12 +89,12 @@ public extension NetworkMananger {
 
     // MARK: Session Headers
     static var httpAdditionalHeaders: [String: String]? {
-        set {
-            UserCacheManager.httpAdditionalHeaders = newValue
-        }
         get {
             UserCacheManager.httpAdditionalHeaders
         }
+        set {
+            UserCacheManager.httpAdditionalHeaders = newValue
+        }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,12 +112,12 @@ extension UILabel: AttributedLabelProtocol { @@
         }
         public var htmlText: String {
-            set {
-                updateWithHtmlString(text: newValue)
-            }
             get {
                 ""
             }
+            set {
+                updateWithHtmlString(text: newValue)
+            }
         }
     }
@@ Expand Down @@