From f7680e6f7b141857b07982ec1efa34b25e99b13a Mon Sep 17 00:00:00 2001 From: Raimundas Sakalauskas Date: Thu, 2 Aug 2018 22:55:28 +0200 Subject: [PATCH] update particle sdk dependency to latest version --- .gitmodules | 3 ++ Cartfile | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/particle-sdk-ios | 1 + ParticleSetup.xcodeproj/project.pbxproj | 2 +- Podfile | 11 +++--- Podfile.lock | 47 ++++++++++++++----------- 7 files changed, 39 insertions(+), 29 deletions(-) create mode 160000 Carthage/Checkouts/particle-sdk-ios diff --git a/.gitmodules b/.gitmodules index f9c64d8..76a647b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "Carthage/Checkouts/SDK"] path = Carthage/Checkouts/SDK url = file:///Volumes/Data/Projects/Particle/SDK +[submodule "Carthage/Checkouts/particle-sdk-ios"] + path = Carthage/Checkouts/particle-sdk-ios + url = https://github.com/particle-iot/particle-sdk-ios.git diff --git a/Cartfile b/Cartfile index 37eab8c..71e142e 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ github "AFNetworking/AFNetworking" ~> 3.0.0 -git "file:///Volumes/Data/Projects/Particle/SDK" "feature/drop_afnetworking" +github "particle-iot/particle-sdk-ios" ~> 0.8.0 github "AgileBits/onepassword-extension" "add-framework-support" diff --git a/Cartfile.resolved b/Cartfile.resolved index 4cd34fa..bbfb0af 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ -git "file:///Volumes/Data/Projects/Particle/SDK" "e41d86c5dcfd3e75b5b508395e030454e324d730" github "AFNetworking/AFNetworking" "3.2.1" github "AgileBits/onepassword-extension" "bcc4cc97fed9a6e73fa204f2e61138e353cb3ef7" +github "particle-iot/particle-sdk-ios" "0.8.0" diff --git a/Carthage/Checkouts/particle-sdk-ios b/Carthage/Checkouts/particle-sdk-ios new file mode 160000 index 0000000..9fc11db --- /dev/null +++ b/Carthage/Checkouts/particle-sdk-ios @@ -0,0 +1 @@ +Subproject commit 9fc11db1bcc4b8926190734d1c64b6bba0a7983f diff --git a/ParticleSetup.xcodeproj/project.pbxproj b/ParticleSetup.xcodeproj/project.pbxproj index 1951262..50a243f 100644 --- a/ParticleSetup.xcodeproj/project.pbxproj +++ b/ParticleSetup.xcodeproj/project.pbxproj @@ -511,8 +511,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 938368C6210639760064D8E3 /* ParticleSetupCarthage */, 936F14CD210B9F4C0095A12F /* ParticleSetupPods */, + 938368C6210639760064D8E3 /* ParticleSetupCarthage */, ); }; /* End PBXProject section */ diff --git a/Podfile b/Podfile index b0dbffc..f07c3cd 100644 --- a/Podfile +++ b/Podfile @@ -2,9 +2,8 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '9.0' -project 'ParticleSetup pod' - target 'ParticleSetup' do - pod 'AFNetworking' - pod 'Particle-SDK' - pod '1PasswordExtension' -end +target 'ParticleSetupPods' do + pod 'AFNetworking' + pod 'Particle-SDK' + pod '1PasswordExtension' +end \ No newline at end of file diff --git a/Podfile.lock b/Podfile.lock index 275187e..25cdeb4 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,25 +1,26 @@ PODS: - 1PasswordExtension (1.8.4) - - AFNetworking (3.1.0): - - AFNetworking/NSURLSession (= 3.1.0) - - AFNetworking/Reachability (= 3.1.0) - - AFNetworking/Security (= 3.1.0) - - AFNetworking/Serialization (= 3.1.0) - - AFNetworking/UIKit (= 3.1.0) - - AFNetworking/NSURLSession (3.1.0): + - AFNetworking (3.2.1): + - AFNetworking/NSURLSession (= 3.2.1) + - AFNetworking/Reachability (= 3.2.1) + - AFNetworking/Security (= 3.2.1) + - AFNetworking/Serialization (= 3.2.1) + - AFNetworking/UIKit (= 3.2.1) + - AFNetworking/NSURLSession (3.2.1): - AFNetworking/Reachability - AFNetworking/Security - AFNetworking/Serialization - - AFNetworking/Reachability (3.1.0) - - AFNetworking/Security (3.1.0) - - AFNetworking/Serialization (3.1.0) - - AFNetworking/UIKit (3.1.0): + - AFNetworking/Reachability (3.2.1) + - AFNetworking/Security (3.2.1) + - AFNetworking/Serialization (3.2.1) + - AFNetworking/UIKit (3.2.1): - AFNetworking/NSURLSession - - Particle-SDK (0.7.0): - - Particle-SDK/Helpers (= 0.7.0) - - Particle-SDK/SDK (= 0.7.0) - - Particle-SDK/Helpers (0.7.0) - - Particle-SDK/SDK (0.7.0): + - Particle-SDK (0.8.0): + - Particle-SDK/Helpers (= 0.8.0) + - Particle-SDK/SDK (= 0.8.0) + - Particle-SDK/Helpers (0.8.0): + - AFNetworking (~> 3.0) + - Particle-SDK/SDK (0.8.0): - AFNetworking (~> 3.0) - Particle-SDK/Helpers @@ -28,11 +29,17 @@ DEPENDENCIES: - AFNetworking - Particle-SDK +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - 1PasswordExtension + - AFNetworking + - Particle-SDK + SPEC CHECKSUMS: 1PasswordExtension: e775a29310c65851e5a6cec1afc349ab4e334e47 - AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67 - Particle-SDK: d08e4a9e42c927bd997cd4817e5a01894ace4187 + AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057 + Particle-SDK: d9538a956995c2f8292d2c6e89691e794140b1f2 -PODFILE CHECKSUM: f866209a14faa101295fdcc2829551024d8ca11a +PODFILE CHECKSUM: 0f32fd9817e10ab3002eedad5b03b781273686fc -COCOAPODS: 1.3.1 +COCOAPODS: 1.5.3