Merge pull request #5 from bfernandesbfs/spm

Spm
uptechteam · Nov 16, 2019 · 9e572f1 · 9e572f1
2 parents 9c56905 + 3162dd1
commit 9e572f1
Show file tree

Hide file tree

Showing 24 changed files with 127 additions and 46 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,7 @@ xcuserdata
 
 # Swift Package Manager
 .build/
+.swiftpm/
 
 # Carthage
 Carthage/Build
diff --git a/AirBar.podspec b/AirBar.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
   spec.name = "AirBar"
-  spec.version = "2.0.5"
+  spec.version = "2.0.6"
   spec.summary = "Airbnb expandable bar."
   spec.homepage = "https://github.com/uptechteam/AirBar"
   spec.license = { type: 'MIT', file: 'LICENSE' }
   spec.authors = { "Evgeny Matviyenko" => 'evgeny.matviyenko@uptech.team' }
 
-  spec.platform = :ios, "9.1"
+  spec.platform = :ios, "10.0"
   spec.swift_version = "4.1"
   spec.requires_arc = true
   spec.source = { git: "https://github.com/uptechteam/AirBar.git", tag: "v#{spec.version}", submodules: true }

diff --git a/AirBar.xcodeproj/project.pbxproj b/AirBar.xcodeproj/project.pbxproj
@@ -404,7 +404,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0820;
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 1110;
 				ORGANIZATIONNAME = uptechteam;
 				TargetAttributes = {
 					6A243AC31E6028D500AC0D40 = {
@@ -427,7 +427,7 @@
 			};
 			buildConfigurationList = 6A243ABE1E6028D500AC0D40 /* Build configuration list for PBXProject "AirBar" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -568,20 +568,29 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -611,6 +620,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -621,20 +631,29 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -656,6 +675,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -682,7 +702,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -704,7 +724,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -717,7 +737,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uptech.AirBarTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -730,7 +750,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uptech.AirBarTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -746,7 +766,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uptech.AirBarExampleApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -762,7 +782,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uptech.AirBarExampleApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/AirBar.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/AirBar.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/AirBar.xcodeproj/xcshareddata/xcschemes/AirBar.xcscheme b/AirBar.xcodeproj/xcshareddata/xcschemes/AirBar.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
-   version = "1.8">
+   LastUpgradeVersion = "1110"
+   version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -26,9 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6A243AC31E6028D500AC0D40"
+            BuildableName = "AirBar.framework"
+            BlueprintName = "AirBar"
+            ReferencedContainer = "container:AirBar.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -41,17 +49,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "6A243AC31E6028D500AC0D40"
-            BuildableName = "AirBar.framework"
-            BlueprintName = "AirBar"
-            ReferencedContainer = "container:AirBar.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -72,8 +69,6 @@
             ReferencedContainer = "container:AirBar.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/AirBar/BarController.swift b/AirBar/BarController.swift
@@ -13,7 +13,7 @@ public typealias StateObserver = (State) -> Void
 private struct ScrollableObservables {
   let contentOffset: Observable<CGPoint>
   let contentSize: Observable<CGSize>
-  let panGestureState: Observable<UIGestureRecognizerState>
+  let panGestureState: Observable<UIGestureRecognizer.State>
 }
 
 public class BarController {
@@ -164,7 +164,7 @@ public class BarController {
   }
 
   // MARK: Pan Gesture Handlers
-  private func panGestureStateChanged(state: UIGestureRecognizerState) {
+  private func panGestureStateChanged(state: UIGestureRecognizer.State) {
     switch state {
     case .began:
       panGestureBegan()

diff --git a/AirBar/Helpers/CGFloat+AirBar.swift b/AirBar/Helpers/CGFloat+AirBar.swift
@@ -6,12 +6,14 @@
 //  Copyright © 2017 uptechteam. All rights reserved.
 //
 
+import UIKit
+
 internal extension CGFloat {
-  internal func isNear(to number: CGFloat, delta: CGFloat) -> Bool {
+  func isNear(to number: CGFloat, delta: CGFloat) -> Bool {
     return self >= (number - delta) && self <= (number + delta)
   }
 
-  internal func map(from firstBounds: (CGFloat, CGFloat), to secondBounds: (CGFloat, CGFloat)) -> CGFloat {
+  func map(from firstBounds: (CGFloat, CGFloat), to secondBounds: (CGFloat, CGFloat)) -> CGFloat {
     guard self > firstBounds.0 else {
       return secondBounds.0
     }
@@ -25,7 +27,7 @@ internal extension CGFloat {
     return secondBounds.0 + ratio * (secondBounds.1 - secondBounds.0)
   }
 
-  internal func bounded(by bounds: (CGFloat, CGFloat)) -> CGFloat {
+  func bounded(by bounds: (CGFloat, CGFloat)) -> CGFloat {
     return Swift.max(bounds.0, Swift.min(bounds.1, self))
   }
 }
diff --git a/AirBar/Models/Configuration.swift b/AirBar/Models/Configuration.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2017 uptechteam. All rights reserved.
 //
 
+import UIKit
+
 public struct Configuration {
   let compactStateHeight: CGFloat
   let normalStateHeight: CGFloat

diff --git a/AirBar/Models/State.swift b/AirBar/Models/State.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2017 uptechteam. All rights reserved.
 //
 
+import UIKit
+
 public struct State {
   internal let offset: CGFloat
   internal let isExpandedStateAvailable: Bool
@@ -47,19 +49,19 @@ public struct State {
 }
 
 public extension State {
-  public func height() -> CGFloat {
+  func height() -> CGFloat {
     return -offset
   }
 
-  public func transitionProgress() -> CGFloat {
+  func transitionProgress() -> CGFloat {
     let stateRange = self.stateRange()
     let offsetBounds = configuration.offsetBounds(for: stateRange)
     let progressBounds = stateRange.progressBounds()
     let reversedProgressBounds = (progressBounds.1, progressBounds.0)
     return offset.map(from: offsetBounds, to: reversedProgressBounds)
   }
 
-  public enum ValueRangeType {
+  enum ValueRangeType {
     case value(CGFloat)
     case range(CGFloat, CGFloat)
 
@@ -73,7 +75,7 @@ public extension State {
     }
   }
 
-  public func value(compactNormalRange: ValueRangeType, normalExpandedRange: ValueRangeType) -> CGFloat {
+  func value(compactNormalRange: ValueRangeType, normalExpandedRange: ValueRangeType) -> CGFloat {
     let progress = self.transitionProgress()
     let stateRange = self.stateRange()
     let valueRange = stateRange == .compactNormal ? compactNormalRange : normalExpandedRange

diff --git a/AirBar/Models/StateRange.swift b/AirBar/Models/StateRange.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2017 uptechteam. All rights reserved.
 //
 
+import UIKit
+
 internal enum StateRange {
   case compactNormal
   case normalExpanded

diff --git a/AirBar/Observables/GestureStateObservable.swift b/AirBar/Observables/GestureStateObservable.swift
@@ -6,7 +6,9 @@
 //  Copyright © 2017 uptechteam. All rights reserved.
 //
 
-internal class GestureStateObservable: Observable<UIGestureRecognizerState> {
+import UIKit
+
+internal class GestureStateObservable: Observable<UIGestureRecognizer.State> {
   private weak var gestureRecognizer: UIGestureRecognizer?
 
   internal init(gestureRecognizer: UIGestureRecognizer) {

diff --git a/AirBar/Observables/KVObservable.swift b/AirBar/Observables/KVObservable.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2017 uptechteam. All rights reserved.
 //
 
+import Foundation
+
 internal class KVObservable<Value>: Observable<Value> {
   private let keyPath: String
   private weak var object: AnyObject?

diff --git a/AirBar/Observables/Observable.swift b/AirBar/Observables/Observable.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2017 uptechteam. All rights reserved.
 //
 
+import Foundation
+
 internal class Observable<Value>: NSObject {
   internal var observer: ((Value) -> Void)?
 }
diff --git a/AirBar/Reducer/CutOutStateRangeDeltaYTransformer.swift b/AirBar/Reducer/CutOutStateRangeDeltaYTransformer.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2017 uptechteam. All rights reserved.
 //
 
+import UIKit
+
 internal let cutOutStateRangeDeltaYTransformer: ContentOffsetDeltaYTransformer = { params -> CGFloat in
   var deltaY = params.contentOffsetDeltaY
 

diff --git a/AirBar/Reducer/IgnoreBottomDeltaYTransformer.swift b/AirBar/Reducer/IgnoreBottomDeltaYTransformer.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2017 uptechteam. All rights reserved.
 //
 
+import UIKit
+
 internal let ignoreBottomDeltaYTransformer: ContentOffsetDeltaYTransformer = { params -> CGFloat in
   var deltaY = params.contentOffsetDeltaY
 

diff --git a/AirBar/Reducer/IgnoreTopDeltaYTransformer.swift b/AirBar/Reducer/IgnoreTopDeltaYTransformer.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2017 uptechteam. All rights reserved.
 //
 
+import UIKit
+
 internal let ignoreTopDeltaYTransformer: ContentOffsetDeltaYTransformer = { params -> CGFloat in
   var deltaY = params.contentOffsetDeltaY