diff --git a/.gitmodules b/.gitmodules index 49b3e0705..f3e97b157 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ -[submodule "Vendor/xctoolchain"] - path = Vendor/xctoolchain - url = https://github.com/parse-community/xctoolchain.git -[submodule "Carthage/Checkouts/Bolts-ObjC"] - path = Carthage/Checkouts/Bolts-ObjC - url = https://github.com/BoltsFramework/Bolts-ObjC.git [submodule "Carthage/Checkouts/OCMock"] path = Carthage/Checkouts/OCMock url = https://github.com/erikdoe/OCMock.git -[submodule "Carthage/Checkouts/facebook-ios-sdk"] - path = Carthage/Checkouts/facebook-ios-sdk - url = https://github.com/facebook/facebook-ios-sdk.git +[submodule "Carthage/Checkouts/Bolts-ObjC"] + path = Carthage/Checkouts/Bolts-ObjC + url = https://github.com/BoltsFramework/Bolts-ObjC.git +[submodule "Carthage/Checkouts/facebook-objc-sdk"] + path = Carthage/Checkouts/facebook-objc-sdk + url = https://github.com/facebook/facebook-objc-sdk.git +[submodule "Vendor/xctoolchain"] + path = Vendor/xctoolchain + url = https://github.com/parse-community/xctoolchain.git diff --git a/Cartfile.resolved b/Cartfile.resolved index 1da8ddf7b..f6a7b385a 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ github "BoltsFramework/Bolts-ObjC" "1.9.0" github "erikdoe/OCMock" "v3.4.3" -github "facebook/facebook-objc-sdk" "v5.5.0" +github "facebook/facebook-objc-sdk" "v5.6.0" diff --git a/Carthage/Checkouts/facebook-ios-sdk b/Carthage/Checkouts/facebook-ios-sdk deleted file mode 160000 index cd1470620..000000000 --- a/Carthage/Checkouts/facebook-ios-sdk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cd14706204c47164dcebe03fb46100da0c6550eb diff --git a/Carthage/Checkouts/facebook-objc-sdk b/Carthage/Checkouts/facebook-objc-sdk new file mode 160000 index 000000000..cf9e0d837 --- /dev/null +++ b/Carthage/Checkouts/facebook-objc-sdk @@ -0,0 +1 @@ +Subproject commit cf9e0d837f9596223b05cb25faf0edf54d6347a2 diff --git a/Vendor/xctoolchain b/Vendor/xctoolchain index 690787abf..a278a5c05 160000 --- a/Vendor/xctoolchain +++ b/Vendor/xctoolchain @@ -1 +1 @@ -Subproject commit 690787abfa21eea11095adf662f6e71154b3b0c8 +Subproject commit a278a5c0523f116d86afa02fcd6ec989662977d5