[General] Update to Swift 3.0 & new Permission

sunshinejr · Jan 18, 2017 · eaa9cb0 · eaa9cb0
1 parent f76b3c6
commit eaa9cb0
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 40 deletions.
diff --git a/Example/Podfile b/Example/Podfile
@@ -1,19 +1,14 @@
 use_frameworks!
 
 target 'RxPermission_Example' do
-  pod 'RxPermission', :path => '../'
-  pod 'Permission', :git => 'https://github.com/delba/Permission', :branch => 'swift-3.0'
-  pod 'RxSwift', :git => 'https://github.com/ReactiveX/RxSwift'
+  pod 'RxPermission/Location', :path => '../'
 end
 
-# Hack to fix testability until cocoapods gets an update
 post_install do |installer|
     installer.pods_project.targets.each do |target|
         target.build_configurations.each do |config|
-            if config.name == 'Debug'
-                config.build_settings['ENABLE_TESTABILITY'] = 'YES'
-                config.build_settings['SWIFT_VERSION'] = '3.0'
-            end
+              config.build_settings['ENABLE_TESTABILITY'] = 'YES'
+              config.build_settings['SWIFT_VERSION'] = '3.0'
         end
     end
 end
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,37 +1,27 @@
 PODS:
-  - Permission (1.5)
-  - RxPermission (1.0.0-beta.1):
-    - Permission
+  - Permission/Core (2.0.3)
+  - Permission/Location (2.0.3):
+    - Permission/Core
+  - RxPermission/Core (1.0.0):
+    - Permission/Core
     - RxSwift
-  - RxSwift (3.0.0-beta.1)
+  - RxPermission/Location (1.0.0):
+    - Permission/Location
+    - RxPermission/Core
+  - RxSwift (3.1.0)
 
 DEPENDENCIES:
-  - Permission (from `https://github.com/delba/Permission`, branch `swift-3.0`)
-  - RxPermission (from `../`)
-  - RxSwift (from `https://github.com/ReactiveX/RxSwift`)
+  - RxPermission/Location (from `../`)
 
 EXTERNAL SOURCES:
-  Permission:
-    :branch: swift-3.0
-    :git: https://github.com/delba/Permission
   RxPermission:
-    :path: ../
-  RxSwift:
-    :git: https://github.com/ReactiveX/RxSwift
-
-CHECKOUT OPTIONS:
-  Permission:
-    :commit: 118772cc410e53acc9ec156d309448cf5861c329
-    :git: https://github.com/delba/Permission
-  RxSwift:
-    :commit: cb5ae2f31f520c0e5d3f75a6c3637cde1c3bbbaa
-    :git: https://github.com/ReactiveX/RxSwift
+    :path: "../"
 
 SPEC CHECKSUMS:
-  Permission: 2d9647f8b994a5faf7e1c5a40d4328fde158c2f2
-  RxPermission: 60c2b2f0e8dfbbef74232b4f824f99b33d8cbccd
-  RxSwift: 0823e8d7969c23bfa9ddfb2afa4881e424a1a710
+  Permission: ef50195e97672de1946f98da7fd71fbfbcf9c23f
+  RxPermission: e0cc69f4255b0e1c333a5da8d53cdb62cda8c9f3
+  RxSwift: 83ff553e7593fdfdcb2562933a64c0284dffdadc
 
-PODFILE CHECKSUM: 8ebf23ccfac9b28506cb118f8da61cee08612973
+PODFILE CHECKSUM: 0866b303d616d0f589243606a355243292262a92
 
 COCOAPODS: 1.0.1
diff --git a/Example/RxPermission.xcodeproj/project.pbxproj b/Example/RxPermission.xcodeproj/project.pbxproj
@@ -141,7 +141,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {

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

diff --git a/RxPermission.podspec b/RxPermission.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxPermission"
-  s.version          = "1.0.0-beta.2"
+  s.version          = "1.0.0"
   s.summary          = "RxSwift bindings for Permissions API in iOS."
   s.description      = <<-EOS
   RxSwift binding for [Permission](https://github.com/delba/Permission) API that helps you with Permissions in iOS.
@@ -12,7 +12,75 @@ Pod::Spec.new do |s|
   s.social_media_url = 'https://twitter.com/thesunshinejr'
   s.platform     = :ios, '8.0'
   s.ios.deployment_target = '8.0'
-  s.source_files = 'Source/*.swift'
-  s.dependency 'Permission'
-  s.dependency 'RxSwift', '3.0.0-beta.1'
+
+  s.subspec 'Core' do |ss|
+    ss.source_files = 'Source/*.swift'    
+    ss.dependency 'Permission/Core'
+    ss.dependency 'RxSwift'
+  end
+
+  s.subspec 'AddressBook' do |ss|
+    ss.dependency 'RxPermission/Core'
+    ss.dependency 'Permission/AddressBook'
+  end
+
+  s.subspec 'Bluetooth' do |ss|
+    ss.dependency 'RxPermission/Core'
+    ss.dependency 'Permission/Bluetooth'
+  end
+
+  s.subspec 'Camera' do |ss|
+    ss.dependency 'RxPermission/Core'
+    ss.dependency 'Permission/Camera'
+  end
+
+  s.subspec 'Contacts' do |ss|
+    ss.dependency 'RxPermission/Core'
+    ss.dependency 'Permission/Contacts'
+  end
+
+  s.subspec 'Events' do |ss|
+    ss.dependency 'RxPermission/Core'
+    ss.dependency 'Permission/Events'
+  end
+
+  s.subspec 'Location' do |ss|
+    ss.dependency 'RxPermission/Core'
+    ss.dependency 'Permission/Location'
+  end
+
+  s.subspec 'Microphone' do |ss|
+    ss.dependency 'RxPermission/Core'
+    ss.dependency 'Permission/Microphone'
+  end
+
+  s.subspec 'Motion' do |ss|
+    ss.dependency 'RxPermission/Core'
+    ss.dependency 'Permission/Motion'
+  end
+
+  s.subspec 'Notifications' do |ss|
+    ss.dependency 'RxPermission/Core'
+    ss.dependency 'Permission/Notifications'
+  end
+
+  s.subspec 'Photos' do |ss|
+    ss.dependency 'RxPermission/Core'
+    ss.dependency 'Permission/Photos'
+  end
+
+  s.subspec 'Reminders' do |ss|
+    ss.dependency 'RxPermission/Core'
+    ss.dependency 'Permission/Reminders'
+  end
+
+  s.subspec 'SpeechRecognizer' do |ss|
+    ss.dependency 'RxPermission/Core'
+    ss.dependency 'Permission/SpeechRecognizer'
+  end
+
+  s.subspec 'MediaLibrary' do |ss|
+    ss.dependency 'RxPermission/Core'
+    ss.dependency 'Permission/MediaLibrary'
+  end
 end
diff --git a/Source/RxPermission.swift b/Source/RxPermission.swift
@@ -23,7 +23,6 @@
 
 import Permission
 import RxSwift
-import RxCocoa
 
 extension Reactive where Base: Permission {