Skip to content
This repository has been archived by the owner on Jul 31, 2024. It is now read-only.

Commit

Permalink
Point VimeoNetworking to its develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
supperspidey authored and Van Le Nguyen committed Aug 9, 2018
1 parent 9f4d277 commit 1c6f7fb
Show file tree
Hide file tree
Showing 29 changed files with 97 additions and 54 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"scale" : "1x"
}
],
"info" : {
Expand Down
6 changes: 3 additions & 3 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ project 'Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload.xcodeproj'
target 'VimeoUpload' do
platform :ios, '8.0'
use_frameworks!
pod 'VimeoNetworking', :git => '[email protected]:vimeo/VimeoNetworking.git', :branch => 'feature/VIM-5876-Share-Extension'
pod 'VimeoNetworking', :git => '[email protected]:vimeo/VimeoNetworking.git', :branch => 'develop'
project 'Framework/VimeoUpload/VimeoUpload.xcodeproj'
end

target :'VimeoUpload-iOS' do
platform :ios, '8.0'
use_frameworks!
pod 'VimeoNetworking', :git => '[email protected]:vimeo/VimeoNetworking.git', :branch => 'feature/VIM-5876-Share-Extension'
pod 'VimeoNetworking', :git => '[email protected]:vimeo/VimeoNetworking.git', :branch => 'develop'
project 'Examples/VimeoUpload-iOS/VimeoUpload-iOS.xcodeproj'

target "VimeoUpload-iOSTests" do
Expand All @@ -24,7 +24,7 @@ end
target :'VimeoUpload-iOS-OldUpload' do
platform :ios, '8.0'
use_frameworks!
pod 'VimeoNetworking', :git => '[email protected]:vimeo/VimeoNetworking.git', :branch => 'feature/VIM-5876-Share-Extension'
pod 'VimeoNetworking', :git => '[email protected]:vimeo/VimeoNetworking.git', :branch => 'develop'
project 'Examples/VimeoUpload-iOS-OldUpload/VimeoUpload-iOS-OldUpload.xcodeproj'

target "VimeoUpload-iOS-OldUploadTests" do
Expand Down
12 changes: 6 additions & 6 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,30 @@ PODS:
- AFNetworking/Serialization (3.1.0)
- AFNetworking/UIKit (3.1.0):
- AFNetworking/NSURLSession
- VimeoNetworking (3.1.0):
- VimeoNetworking (3.2.0):
- AFNetworking (= 3.1.0)

DEPENDENCIES:
- "VimeoNetworking (from `[email protected]:vimeo/VimeoNetworking.git`, branch `feature/VIM-5876-Share-Extension`)"
- "VimeoNetworking (from `[email protected]:vimeo/VimeoNetworking.git`, branch `develop`)"

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- AFNetworking

EXTERNAL SOURCES:
VimeoNetworking:
:branch: feature/VIM-5876-Share-Extension
:branch: develop
:git: "[email protected]:vimeo/VimeoNetworking.git"

CHECKOUT OPTIONS:
VimeoNetworking:
:commit: dccd197b269764e1e42b3377d083391d8746bcbb
:commit: 395710a68cb5c81a2089de94fb3b7fe28bf4c210
:git: "[email protected]:vimeo/VimeoNetworking.git"

SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
VimeoNetworking: 64fe0a9f12d106c2fe1c54f4114b25a80931bf37
VimeoNetworking: cef00b867495a61e9b5e10f5a6b309d82a200c02

PODFILE CHECKSUM: b99f0640652fedc418368de2440c51afd1125a48
PODFILE CHECKSUM: dd1c01077873d3593d24f554a22b00f665c04b49

COCOAPODS: 1.5.2
7 changes: 4 additions & 3 deletions Pods/Local Podspecs/VimeoNetworking.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Pods/Target Support Files/VimeoNetworking/Info.plist

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Pods/VimeoNetworking/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMUser.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions Pods/VimeoNetworking/VimeoNetworking/Sources/Models/VIMVideo.m

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1c6f7fb

Please sign in to comment.