Skip to content

Updating submodule versions to fix build. #1454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 25, 2019
Merged

Updating submodule versions to fix build. #1454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2e2f89c
committing removal of submodule and cartfile data
noobs2ninjas Sep 25, 2019
181a662
updating cartfile and gitmodules
noobs2ninjas Sep 25, 2019
ea6ff58
removing carthage stuff
noobs2ninjas Sep 25, 2019
b6edb0e
Updating checkouts
noobs2ninjas Sep 25, 2019
2967f0a
adding toolchain
noobs2ninjas Sep 25, 2019
21f2b85
Updating submodules
noobs2ninjas Sep 25, 2019
9c9b1c9
Updating submodules for updating build settings.
noobs2ninjas Sep 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
1 change: 0 additions & 1 deletion Carthage/Checkouts/facebook-ios-sdk
Open in desktop
Submodule facebook-ios-sdk deleted from cd1470
1 change: 1 addition & 0 deletions Carthage/Checkouts/facebook-objc-sdk
Open in desktop
Submodule facebook-objc-sdk added at cf9e0d
2 changes: 1 addition & 1 deletion Vendor/xctoolchain
Open in desktop
Submodule xctoolchain updated 1 files
+3 −3 Scripts/xctask/build_framework_task.rb