From c6ae494b4f6bcbbf3ac1f988f57232428e1f8830 Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Fri, 29 Jul 2016 12:51:13 -0700 Subject: [PATCH 1/6] Use Xcode 7.3 for Travis-CI. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5285c7fe..179f6c23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ branches: - master language: objective-c os: osx -osx_image: xcode7.2 +osx_image: xcode7.3 cache: - cocoapods env: From aed471eaf74756003e30527540e585386a541e58 Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Fri, 29 Jul 2016 12:09:52 -0700 Subject: [PATCH 2/6] Update gem dependencies. --- Gemfile | 2 +- Gemfile.lock | 65 ++++++++++++++++++++++++++-------------------------- 2 files changed, 33 insertions(+), 34 deletions(-) diff --git a/Gemfile b/Gemfile index f73f5b65..4618115d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' gem 'xcpretty' -gem 'cocoapods', '>= 1.0.0.beta.6' +gem 'cocoapods' diff --git a/Gemfile.lock b/Gemfile.lock index b068694b..e57b1914 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,61 +1,60 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.6) + activesupport (5.0.0) + concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - claide (1.0.0.beta.3) - cocoapods (1.0.0.beta.6) + claide (1.0.0) + cocoapods (1.0.1) activesupport (>= 4.0.2) - claide (>= 1.0.0.beta.3, < 2.0) - cocoapods-core (= 1.0.0.beta.6) - cocoapods-deintegrate (>= 1.0.0.beta.1, < 2.0) - cocoapods-downloader (>= 1.0.0.beta.2, < 2.0) - cocoapods-plugins (>= 1.0.0.beta.1, < 2.0) - cocoapods-search (>= 1.0.0.beta.1, < 2.0) - cocoapods-stats (>= 1.0.0.beta.3, < 2.0) - cocoapods-trunk (>= 1.0.0.beta.2, < 2.0) - cocoapods-try (>= 1.0.0.beta.3, < 2.0) + claide (>= 1.0.0, < 2.0) + cocoapods-core (= 1.0.1) + cocoapods-deintegrate (>= 1.0.0, < 2.0) + cocoapods-downloader (>= 1.0.0, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-stats (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.0.0, < 2.0) + cocoapods-try (>= 1.0.0, < 2.0) colored (~> 1.2) escape (~> 0.0.4) fourflusher (~> 0.3.0) - molinillo (~> 0.4.4) + molinillo (~> 0.4.5) nap (~> 1.0) - xcodeproj (>= 1.0.0.beta.3, < 2.0) - cocoapods-core (1.0.0.beta.6) + xcodeproj (>= 1.1.0, < 2.0) + cocoapods-core (1.0.1) activesupport (>= 4.0.2) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.0.beta.1) - cocoapods-downloader (1.0.0.beta.2) - cocoapods-plugins (1.0.0.beta.1) + cocoapods-deintegrate (1.0.0) + cocoapods-downloader (1.1.0) + cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0.beta.1) - cocoapods-stats (1.0.0.beta.3) - cocoapods-trunk (1.0.0.beta.2) + cocoapods-search (1.0.0) + cocoapods-stats (1.0.0) + cocoapods-trunk (1.0.0) nap (>= 0.8, < 2.0) netrc (= 0.7.8) - cocoapods-try (1.0.0.beta.3) + cocoapods-try (1.1.0) colored (1.2) + concurrent-ruby (1.0.2) escape (0.0.4) - fourflusher (0.3.0) + fourflusher (0.3.2) fuzzy_match (2.0.4) i18n (0.7.0) - json (1.8.3) - minitest (5.8.4) - molinillo (0.4.4) + minitest (5.9.0) + molinillo (0.4.5) nap (1.1.0) netrc (0.7.8) - rouge (1.10.1) + rouge (1.11.1) thread_safe (0.3.5) tzinfo (1.2.2) thread_safe (~> 0.1) - xcodeproj (1.0.0.beta.3) + xcodeproj (1.2.0) activesupport (>= 3) - claide (>= 1.0.0.beta.1, < 2.0) + claide (>= 1.0.0, < 2.0) colored (~> 1.2) xcpretty (0.2.2) rouge (~> 1.8) @@ -64,8 +63,8 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (>= 1.0.0.beta.6) + cocoapods xcpretty BUNDLED WITH - 1.11.2 + 1.12.5 From dc2ef2eafcafdae04aee2ea31925a9f364ad3ef7 Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Fri, 29 Jul 2016 12:14:01 -0700 Subject: [PATCH 3/6] Update CocoaPods dependencies. --- .../project.pbxproj | 18 ++++++------ .../LiveQueryDemo.xcodeproj/project.pbxproj | 18 ++++++------ ParseLiveQuery.podspec | 6 ++-- Podfile | 29 +++++++++---------- Podfile.lock | 22 +++++++------- .../ParseLiveQuery.xcodeproj/project.pbxproj | 24 +++++++-------- 6 files changed, 58 insertions(+), 59 deletions(-) diff --git a/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj b/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj index 74f38253..00624c73 100644 --- a/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj +++ b/Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj @@ -135,12 +135,12 @@ isa = PBXNativeTarget; buildConfigurationList = F509D5431CA9E597007B15B0 /* Build configuration list for PBXNativeTarget "LiveQueryDemo-ObjC" */; buildPhases = ( - 87DA45B46CF98727F2E13351 /* 📦 Check Pods Manifest.lock */, + 87DA45B46CF98727F2E13351 /* [CP] Check Pods Manifest.lock */, F509D52E1CA9E597007B15B0 /* Sources */, F509D52F1CA9E597007B15B0 /* Frameworks */, F509D5301CA9E597007B15B0 /* Resources */, - EA41B3F790AE39BE08641EBB /* 📦 Embed Pods Frameworks */, - A8851B9B8AD727FB055366F2 /* 📦 Copy Pods Resources */, + EA41B3F790AE39BE08641EBB /* [CP] Embed Pods Frameworks */, + A8851B9B8AD727FB055366F2 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -218,14 +218,14 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 87DA45B46CF98727F2E13351 /* 📦 Check Pods Manifest.lock */ = { + 87DA45B46CF98727F2E13351 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "📦 Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -233,14 +233,14 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - A8851B9B8AD727FB055366F2 /* 📦 Copy Pods Resources */ = { + A8851B9B8AD727FB055366F2 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "📦 Copy Pods Resources"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -248,14 +248,14 @@ shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-resources.sh\"\n"; showEnvVarsInLog = 0; }; - EA41B3F790AE39BE08641EBB /* 📦 Embed Pods Frameworks */ = { + EA41B3F790AE39BE08641EBB /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "📦 Embed Pods Frameworks"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Examples/LiveQueryDemo.xcodeproj/project.pbxproj b/Examples/LiveQueryDemo.xcodeproj/project.pbxproj index 3ef1fc42..01edfe18 100644 --- a/Examples/LiveQueryDemo.xcodeproj/project.pbxproj +++ b/Examples/LiveQueryDemo.xcodeproj/project.pbxproj @@ -123,12 +123,12 @@ isa = PBXNativeTarget; buildConfigurationList = F509D5251CA9E4AE007B15B0 /* Build configuration list for PBXNativeTarget "LiveQueryDemo" */; buildPhases = ( - E6F699DDDA9E6B861F705AD5 /* 📦 Check Pods Manifest.lock */, + E6F699DDDA9E6B861F705AD5 /* [CP] Check Pods Manifest.lock */, F509D5131CA9E4AE007B15B0 /* Sources */, F509D5141CA9E4AE007B15B0 /* Frameworks */, F509D5151CA9E4AE007B15B0 /* Resources */, - 045C33FD1807E3932888A2F9 /* 📦 Embed Pods Frameworks */, - D9EF05A29B9F1AAC9B62408C /* 📦 Copy Pods Resources */, + 045C33FD1807E3932888A2F9 /* [CP] Embed Pods Frameworks */, + D9EF05A29B9F1AAC9B62408C /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -206,14 +206,14 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 045C33FD1807E3932888A2F9 /* 📦 Embed Pods Frameworks */ = { + 045C33FD1807E3932888A2F9 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "📦 Embed Pods Frameworks"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -221,14 +221,14 @@ shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - D9EF05A29B9F1AAC9B62408C /* 📦 Copy Pods Resources */ = { + D9EF05A29B9F1AAC9B62408C /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "📦 Copy Pods Resources"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -236,14 +236,14 @@ shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-resources.sh\"\n"; showEnvVarsInLog = 0; }; - E6F699DDDA9E6B861F705AD5 /* 📦 Check Pods Manifest.lock */ = { + E6F699DDDA9E6B861F705AD5 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "📦 Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec index 45885acc..683225d3 100644 --- a/ParseLiveQuery.podspec +++ b/ParseLiveQuery.podspec @@ -16,7 +16,7 @@ Pod::Spec.new do |s| s.source_files = 'Sources/ParseLiveQuery/**/*.swift' s.module_name = 'ParseLiveQuery' - s.dependency 'Parse' - s.dependency 'Bolts-Swift' - s.dependency 'SocketRocket' + s.dependency 'Parse', '~> 1.14' + s.dependency 'Bolts-Swift', '~> 1.2' + s.dependency 'SocketRocket', '~> 0.5' end diff --git a/Podfile b/Podfile index c6e0bef4..e0d3f5fe 100644 --- a/Podfile +++ b/Podfile @@ -1,37 +1,36 @@ -# Uncomment this line to define a global platform for your project -# platform :ios, '8.0' -# Uncomment this line if you're using Swift use_frameworks! workspace 'ParseLiveQuery.xcworkspace' -target 'ParseLiveQuery-OSX' do - project 'Sources/ParseLiveQuery.xcodeproj' - platform :osx, '10.9' +def commonPods pod 'Parse' pod 'Bolts-Swift' pod 'SocketRocket' end +target 'ParseLiveQuery-OSX' do + project 'Sources/ParseLiveQuery.xcodeproj' + platform :osx, '10.9' + + commonPods +end + target 'ParseLiveQuery-iOS' do project 'Sources/ParseLiveQuery.xcodeproj' platform :ios, '8.0' - pod 'Parse' - pod 'Bolts-Swift' - pod 'SocketRocket' + + commonPods end target 'LiveQueryDemo' do project 'Examples/LiveQueryDemo.xcodeproj' platform :osx, '10.9' - pod 'Parse' - pod 'Bolts-Swift' - pod 'SocketRocket' + + commonPods end target 'LiveQueryDemo-ObjC' do project 'Examples/LiveQueryDemo-ObjC.xcodeproj' platform :osx, '10.9' - pod 'Parse' - pod 'Bolts-Swift' - pod 'SocketRocket' + + commonPods end diff --git a/Podfile.lock b/Podfile.lock index 34a970c1..95ea07a5 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,9 +1,9 @@ PODS: - - Bolts-Swift (1.0.1) - - Bolts/Tasks (1.7.0) - - Parse (1.13.0): - - Bolts/Tasks (~> 1.6) - - SocketRocket (0.5.0) + - Bolts-Swift (1.2.0) + - Bolts/Tasks (1.8.4) + - Parse (1.14.2): + - Bolts/Tasks (~> 1.8) + - SocketRocket (0.5.1) DEPENDENCIES: - Bolts-Swift @@ -11,11 +11,11 @@ DEPENDENCIES: - SocketRocket SPEC CHECKSUMS: - Bolts: a0058fa3b331c5a1e4402d534f2dae36dbff31e4 - Bolts-Swift: 1c4c4955b1aacfc83f6a1998f6ad9627c35f8c4f - Parse: f51c24d2feb412e4b2d6cc73d37cb24e8d0089bc - SocketRocket: 2c51efccd2d73c99a923407ca4b06e7e9da95dbf + Bolts: 8a7995239dbe724f9cba2248b766d48b7ebdd322 + Bolts-Swift: ac4e7d26719ed0f73aa85b9310da1648105fbde3 + Parse: 4335d65f40cb3d43190d723144bbe1afb9c38230 + SocketRocket: d57c7159b83c3c6655745cd15302aa24b6bae531 -PODFILE CHECKSUM: 8b4289d8be4dced36d3871d24ac231402f0c5dfd +PODFILE CHECKSUM: f78cfa7c25dd713e93d9018d0086646c1d4623bc -COCOAPODS: 1.0.0.beta.6 +COCOAPODS: 1.0.1 diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index 18090699..d9484b03 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -180,12 +180,12 @@ isa = PBXNativeTarget; buildConfigurationList = F5903CEF1BD999C500C3EFFE /* Build configuration list for PBXNativeTarget "ParseLiveQuery-OSX" */; buildPhases = ( - 432EB76C64066D923373DC45 /* 📦 Check Pods Manifest.lock */, + 432EB76C64066D923373DC45 /* [CP] Check Pods Manifest.lock */, F5903CE51BD999C500C3EFFE /* Sources */, F5903CE61BD999C500C3EFFE /* Frameworks */, F5903CE71BD999C500C3EFFE /* Headers */, F5903CE81BD999C500C3EFFE /* Resources */, - 458C6F69E79D3F67465FC4DB /* 📦 Copy Pods Resources */, + 458C6F69E79D3F67465FC4DB /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -200,12 +200,12 @@ isa = PBXNativeTarget; buildConfigurationList = F5A9BFC71BE0248D00E78326 /* Build configuration list for PBXNativeTarget "ParseLiveQuery-iOS" */; buildPhases = ( - 0779A1A9A8C094A6EC98CD51 /* 📦 Check Pods Manifest.lock */, + 0779A1A9A8C094A6EC98CD51 /* [CP] Check Pods Manifest.lock */, F5A9BFBA1BE0248D00E78326 /* Sources */, F5A9BFC01BE0248D00E78326 /* Frameworks */, F5A9BFC31BE0248D00E78326 /* Headers */, F5A9BFC51BE0248D00E78326 /* Resources */, - 89E3C0C052352147C9B80227 /* 📦 Copy Pods Resources */, + 89E3C0C052352147C9B80227 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -267,14 +267,14 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0779A1A9A8C094A6EC98CD51 /* 📦 Check Pods Manifest.lock */ = { + 0779A1A9A8C094A6EC98CD51 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "📦 Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -282,14 +282,14 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - 432EB76C64066D923373DC45 /* 📦 Check Pods Manifest.lock */ = { + 432EB76C64066D923373DC45 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "📦 Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -297,14 +297,14 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - 458C6F69E79D3F67465FC4DB /* 📦 Copy Pods Resources */ = { + 458C6F69E79D3F67465FC4DB /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "📦 Copy Pods Resources"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -312,14 +312,14 @@ shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-ParseLiveQuery-OSX/Pods-ParseLiveQuery-OSX-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 89E3C0C052352147C9B80227 /* 📦 Copy Pods Resources */ = { + 89E3C0C052352147C9B80227 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "📦 Copy Pods Resources"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; From dd2251c0d4a2f907084337a741dbfe24b48cf417 Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Fri, 29 Jul 2016 12:15:52 -0700 Subject: [PATCH 4/6] Update usage of deprecated BoltsSwift APIs. --- Sources/ParseLiveQuery.xcodeproj/project.pbxproj | 2 +- Sources/ParseLiveQuery/Internal/BoltsHelpers.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj index d9484b03..e4d798c3 100644 --- a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj +++ b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj @@ -134,13 +134,13 @@ isa = PBXGroup; children = ( F5DC9D381BD9BAFC00E8FF07 /* Internal */, - 81464FC51CA31DA0000235E7 /* Resources */, F5591BA31BD720E10072F966 /* Client.swift */, F534A5B11BDAFE0200CBD11A /* Subscription.swift */, F54D58B51C8E33D9009F8D6C /* ObjCCompat.swift */, F59CA92E1C8E496200329737 /* Errors.swift */, 0632EDD31CA1A6DB00DD3CB8 /* Parse+LiveQuery.swift */, F5A88F491C9B6EBA002F0E0D /* PFQuery+Subscribe.swift */, + 81464FC51CA31DA0000235E7 /* Resources */, ); path = ParseLiveQuery; sourceTree = ""; diff --git a/Sources/ParseLiveQuery/Internal/BoltsHelpers.swift b/Sources/ParseLiveQuery/Internal/BoltsHelpers.swift index 7fd31155..68b24a15 100644 --- a/Sources/ParseLiveQuery/Internal/BoltsHelpers.swift +++ b/Sources/ParseLiveQuery/Internal/BoltsHelpers.swift @@ -33,9 +33,9 @@ func swiftTask(task: BFTask) -> Task { if task.cancelled { taskCompletionSource.tryCancel() } else if let error = task.error where task.faulted { - taskCompletionSource.trySetError(error) + taskCompletionSource.trySet(error: error) } else if let result = task.result { - taskCompletionSource.trySetResult(result) + taskCompletionSource.trySet(result: result) } else { fatalError("Unknown task state") } From d43c4b8e4b12526872f2d3460e2f677fc0715b58 Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Fri, 29 Jul 2016 12:18:10 -0700 Subject: [PATCH 5/6] Fix usage of deprecated Swift APIs. --- Sources/ParseLiveQuery/Subscription.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/ParseLiveQuery/Subscription.swift b/Sources/ParseLiveQuery/Subscription.swift index 69aacd66..38a72498 100644 --- a/Sources/ParseLiveQuery/Subscription.swift +++ b/Sources/ParseLiveQuery/Subscription.swift @@ -18,7 +18,7 @@ import BoltsSwift */ public protocol SubscriptionHandling: AnyObject { /// The type of the PFObject subclass that this handler uses. - typealias PFObjectSubclass: PFObject + associatedtype PFObjectSubclass: PFObject /** Tells the handler that an event has been received from the live query server. From 6a6204d1b5670f0536888c99fbf96a14a9a95d4a Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Fri, 29 Jul 2016 14:07:38 -0700 Subject: [PATCH 6/6] Add default ruby version file. --- .ruby-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 00000000..2bf1c1cc --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.3.1