From 2e2f89c5969dca42f6d7fcb070ed0c0c56a9baa3 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Wed, 25 Sep 2019 01:55:06 -0500 Subject: [PATCH 1/7] committing removal of submodule and cartfile data --- .gitmodules | 12 ------------ Cartfile.resolved | 3 --- Carthage/Checkouts/facebook-objc-sdk | 1 + 3 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 Cartfile.resolved create mode 160000 Carthage/Checkouts/facebook-objc-sdk diff --git a/.gitmodules b/.gitmodules index 49b3e0705..e69de29bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +0,0 @@ -[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 diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index 1da8ddf7b..000000000 --- a/Cartfile.resolved +++ /dev/null @@ -1,3 +0,0 @@ -github "BoltsFramework/Bolts-ObjC" "1.9.0" -github "erikdoe/OCMock" "v3.4.3" -github "facebook/facebook-objc-sdk" "v5.5.0" 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 From 181a662f562e63f2898b69ab9f4c3a26f05ffe32 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Wed, 25 Sep 2019 01:58:23 -0500 Subject: [PATCH 2/7] updating cartfile and gitmodules --- .gitmodules | 6 ++++++ Cartfile.resolved | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 Cartfile.resolved diff --git a/.gitmodules b/.gitmodules index e69de29bb..3b037a721 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "Carthage/Checkouts/facebook-objc-sdk"] + url = https://github.com/facebook/facebook-objc-sdk.git +[submodule "Carthage/Checkouts/OCMock"] + url = https://github.com/erikdoe/OCMock.git +[submodule "Carthage/Checkouts/Bolts-ObjC"] + url = https://github.com/BoltsFramework/Bolts-ObjC.git diff --git a/Cartfile.resolved b/Cartfile.resolved new file mode 100644 index 000000000..f6a7b385a --- /dev/null +++ b/Cartfile.resolved @@ -0,0 +1,3 @@ +github "BoltsFramework/Bolts-ObjC" "1.9.0" +github "erikdoe/OCMock" "v3.4.3" +github "facebook/facebook-objc-sdk" "v5.6.0" From ea6ff58d52aed9433df75c889c49a3b72419ba18 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Wed, 25 Sep 2019 02:09:12 -0500 Subject: [PATCH 3/7] removing carthage stuff --- .gitmodules | 6 ------ Carthage/Checkouts/Bolts-ObjC | 1 - Carthage/Checkouts/OCMock | 1 - Carthage/Checkouts/facebook-ios-sdk | 1 - Carthage/Checkouts/facebook-objc-sdk | 1 - 5 files changed, 10 deletions(-) delete mode 160000 Carthage/Checkouts/Bolts-ObjC delete mode 160000 Carthage/Checkouts/OCMock delete mode 160000 Carthage/Checkouts/facebook-ios-sdk delete mode 160000 Carthage/Checkouts/facebook-objc-sdk diff --git a/.gitmodules b/.gitmodules index 3b037a721..e69de29bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +0,0 @@ -[submodule "Carthage/Checkouts/facebook-objc-sdk"] - url = https://github.com/facebook/facebook-objc-sdk.git -[submodule "Carthage/Checkouts/OCMock"] - url = https://github.com/erikdoe/OCMock.git -[submodule "Carthage/Checkouts/Bolts-ObjC"] - url = https://github.com/BoltsFramework/Bolts-ObjC.git diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC deleted file mode 160000 index 4dc65427d..000000000 --- a/Carthage/Checkouts/Bolts-ObjC +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 diff --git a/Carthage/Checkouts/OCMock b/Carthage/Checkouts/OCMock deleted file mode 160000 index 62fd0b23c..000000000 --- a/Carthage/Checkouts/OCMock +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 62fd0b23c6f5be5c4166211f82b4e162af9ad4ce 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 deleted file mode 160000 index cf9e0d837..000000000 --- a/Carthage/Checkouts/facebook-objc-sdk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cf9e0d837f9596223b05cb25faf0edf54d6347a2 From b6edb0e3f317713c0e3b1b330165fca3565aa935 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Wed, 25 Sep 2019 02:13:24 -0500 Subject: [PATCH 4/7] Updating checkouts --- .gitmodules | 9 +++++++++ Carthage/Checkouts/Bolts-ObjC | 1 + Carthage/Checkouts/OCMock | 1 + Carthage/Checkouts/facebook-objc-sdk | 1 + 4 files changed, 12 insertions(+) create mode 160000 Carthage/Checkouts/Bolts-ObjC create mode 160000 Carthage/Checkouts/OCMock create mode 160000 Carthage/Checkouts/facebook-objc-sdk diff --git a/.gitmodules b/.gitmodules index e69de29bb..9e3bc725f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,9 @@ +[submodule "Carthage/Checkouts/OCMock"] + path = Carthage/Checkouts/OCMock + url = https://github.com/erikdoe/OCMock.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 diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC new file mode 160000 index 000000000..4dc65427d --- /dev/null +++ b/Carthage/Checkouts/Bolts-ObjC @@ -0,0 +1 @@ +Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 diff --git a/Carthage/Checkouts/OCMock b/Carthage/Checkouts/OCMock new file mode 160000 index 000000000..62fd0b23c --- /dev/null +++ b/Carthage/Checkouts/OCMock @@ -0,0 +1 @@ +Subproject commit 62fd0b23c6f5be5c4166211f82b4e162af9ad4ce 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 From 2967f0a2deb3999b7e7901896bf246e1b7cee56f Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Wed, 25 Sep 2019 02:31:37 -0500 Subject: [PATCH 5/7] adding toolchain --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitmodules b/.gitmodules index 9e3bc725f..f3e97b157 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [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 From 21f2b85ae13ab7803d3fe49bbfd84141cbdc3ff9 Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Wed, 25 Sep 2019 02:42:49 -0500 Subject: [PATCH 6/7] Updating submodules --- Carthage/Checkouts/Bolts-ObjC | 2 +- Carthage/Checkouts/OCMock | 2 +- Carthage/Checkouts/facebook-objc-sdk | 2 +- Vendor/xctoolchain | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC index 4dc65427d..1b247a704 160000 --- a/Carthage/Checkouts/Bolts-ObjC +++ b/Carthage/Checkouts/Bolts-ObjC @@ -1 +1 @@ -Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 +Subproject commit 1b247a7047546e9eecd36387a121977b53e2ea43 diff --git a/Carthage/Checkouts/OCMock b/Carthage/Checkouts/OCMock index 62fd0b23c..eb8376db8 160000 --- a/Carthage/Checkouts/OCMock +++ b/Carthage/Checkouts/OCMock @@ -1 +1 @@ -Subproject commit 62fd0b23c6f5be5c4166211f82b4e162af9ad4ce +Subproject commit eb8376db8100a40e48be641d4da43c9ca5e9f4bb diff --git a/Carthage/Checkouts/facebook-objc-sdk b/Carthage/Checkouts/facebook-objc-sdk index cf9e0d837..411c81824 160000 --- a/Carthage/Checkouts/facebook-objc-sdk +++ b/Carthage/Checkouts/facebook-objc-sdk @@ -1 +1 @@ -Subproject commit cf9e0d837f9596223b05cb25faf0edf54d6347a2 +Subproject commit 411c81824d385c15859786d9c96822ef35987e8a diff --git a/Vendor/xctoolchain b/Vendor/xctoolchain index 690787abf..0bb676051 160000 --- a/Vendor/xctoolchain +++ b/Vendor/xctoolchain @@ -1 +1 @@ -Subproject commit 690787abfa21eea11095adf662f6e71154b3b0c8 +Subproject commit 0bb676051e2050e97eba9c9eba8ff5b5a7a5c054 From 9c9b1c9837647381df2b0978ef933e5583c4a4cb Mon Sep 17 00:00:00 2001 From: Nathan Kellert Date: Wed, 25 Sep 2019 14:54:04 -0500 Subject: [PATCH 7/7] Updating submodules for updating build settings. --- Carthage/Checkouts/Bolts-ObjC | 2 +- Carthage/Checkouts/OCMock | 2 +- Carthage/Checkouts/facebook-objc-sdk | 2 +- Vendor/xctoolchain | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC index 1b247a704..4dc65427d 160000 --- a/Carthage/Checkouts/Bolts-ObjC +++ b/Carthage/Checkouts/Bolts-ObjC @@ -1 +1 @@ -Subproject commit 1b247a7047546e9eecd36387a121977b53e2ea43 +Subproject commit 4dc65427dddc19f78db394941127c1528e55ede8 diff --git a/Carthage/Checkouts/OCMock b/Carthage/Checkouts/OCMock index eb8376db8..62fd0b23c 160000 --- a/Carthage/Checkouts/OCMock +++ b/Carthage/Checkouts/OCMock @@ -1 +1 @@ -Subproject commit eb8376db8100a40e48be641d4da43c9ca5e9f4bb +Subproject commit 62fd0b23c6f5be5c4166211f82b4e162af9ad4ce diff --git a/Carthage/Checkouts/facebook-objc-sdk b/Carthage/Checkouts/facebook-objc-sdk index 411c81824..cf9e0d837 160000 --- a/Carthage/Checkouts/facebook-objc-sdk +++ b/Carthage/Checkouts/facebook-objc-sdk @@ -1 +1 @@ -Subproject commit 411c81824d385c15859786d9c96822ef35987e8a +Subproject commit cf9e0d837f9596223b05cb25faf0edf54d6347a2 diff --git a/Vendor/xctoolchain b/Vendor/xctoolchain index 0bb676051..a278a5c05 160000 --- a/Vendor/xctoolchain +++ b/Vendor/xctoolchain @@ -1 +1 @@ -Subproject commit 0bb676051e2050e97eba9c9eba8ff5b5a7a5c054 +Subproject commit a278a5c0523f116d86afa02fcd6ec989662977d5