CocoaPod compile fixes

skedgo · Jul 15, 2018 · 29f32b6 · 29f32b6
1 parent 0bc7591
commit 29f32b6
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 21 deletions.
diff --git a/TripKit.podspec b/TripKit.podspec
@@ -11,6 +11,7 @@ Pod::Spec.new do |s|
   # s.source       = { path: "." }
   # s.source       = { git: "." }
   s.source       = { git: "https://github.com/skedgo/tripkit-ios.git", tag: "v#{s.version}" }
+  s.swift_version = '4.0'
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.12'
   s.requires_arc = true
@@ -22,6 +23,7 @@ Pod::Spec.new do |s|
   s.dependency 'RxCocoa', '~> 4.0.0'
 
   s.source_files = [
+    "TripKit/TripKit.h",
     "TripKit/Classes/**/*.{h,m,swift}",
     "TripKit/AddOns/Share/**/*"
   ]

diff --git a/TripKit/Classes/TripKit.h b/TripKit/Classes/TripKit.h
diff --git a/TripKit/Classes/core/Search/SGAutocompletionDataSource.swift b/TripKit/Classes/core/Search/SGAutocompletionDataSource.swift
@@ -35,7 +35,7 @@ extension SGAutocompletionDataSource {
   }
 
   @objc(prepareForNewSearchForMapRect:)
-  func prepareForNewSearch(for mapRect: MKMapRect) {
+  public func prepareForNewSearch(for mapRect: MKMapRect) {
     storage.disposeBag = DisposeBag()
 
     // When the input is changing, update the results
@@ -86,18 +86,18 @@ extension SGAutocompletionDataSource {
   }
 
   @objc
-  var startedTyping: Bool {
+  public var startedTyping: Bool {
     return !storage.inputText.value.isEmpty
   }
 
   @objc
-  var autocompletionResults: [SGAutocompletionResult] {
+  public var autocompletionResults: [SGAutocompletionResult] {
     return storage.results.value
   }
 
   #if os(iOS) || os(tvOS)
   @objc(additionalActionsForPresenter:)
-  func additionalActions(for presenter: UIViewController) -> [String] {
+  public func additionalActions(for presenter: UIViewController) -> [String] {
     return providers.compactMap { $0.additionalAction(for: presenter)?.0 }
   }
   #endif

diff --git a/TripKitBookings.podspec b/TripKitBookings.podspec
@@ -11,6 +11,7 @@ Pod::Spec.new do |s|
   # s.source       = { path: "." }
   # s.source       = { git: "." }
   s.source       = { git: "https://github.com/skedgo/tripkit-ios.git", tag: "v#{s.version}" }
+  s.swift_version = '4.0'
   s.ios.deployment_target = '9.0'
   s.requires_arc = true
 

diff --git a/TripKitInterApp.podspec b/TripKitInterApp.podspec
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   # s.source       = { path: "." }
   # s.source       = { git: "." }
   s.source       = { git: "https://github.com/skedgo/tripkit-ios.git", tag: "v#{s.version}" }
-
+  s.swift_version = '4.0'
   s.ios.deployment_target = '9.0'
   s.requires_arc = true
 

diff --git a/TripKitUI.podspec b/TripKitUI.podspec
@@ -11,6 +11,7 @@ Pod::Spec.new do |s|
   # s.source       = { path: "." }
   # s.source       = { git: "." }
   s.source       = { git: "https://github.com/skedgo/tripkit-ios.git", tag: "v#{s.version}" }
+  s.swift_version = '4.0'
   s.ios.deployment_target = '9.0'
   s.requires_arc = true
 
@@ -24,6 +25,7 @@ Pod::Spec.new do |s|
   s.dependency 'Kingfisher'
   s.dependency 'RxSwift', '~> 4.0.0'
   s.dependency 'RxCocoa', '~> 4.0.0'
+  s.dependency 'RxDataSources', '~> 3.0.0'
 
   s.source_files = [
     "TripKitUI-iOS/*.h",

diff --git a/TripKitUI/views/TKAlertInfoView.swift b/TripKitUI/views/TKAlertInfoView.swift
@@ -65,7 +65,7 @@ public class TKAlertInfoView: UIView {
   @objc public func showTitleOnly(maxY: CGFloat) {
     guard superview != nil, isShowingFullContent else { return }
     let bottomPadding: CGFloat
-    if #available(iOSApplicationExtension 11.0, *) {
+    if #available(iOS 11.0, *) {
       bottomPadding = safeAreaInsets.bottom
     } else {
       bottomPadding = 0
@@ -81,7 +81,7 @@ public class TKAlertInfoView: UIView {
     guard superview != nil, !isShowingFullContent else { return }
 
     let bottomPadding: CGFloat
-    if #available(iOSApplicationExtension 11.0, *) {
+    if #available(iOS 11.0, *) {
       bottomPadding = safeAreaInsets.bottom
     } else {
       bottomPadding = 0