Bug 1239508 - Switch to Carthage from git submodules

mozilla-mobile · Feb 13, 2016 · d909bc5 · d909bc5
1 parent b33bbea
commit d909bc5
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 237 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,4 @@ DerivedData
 .idea
 
 Lists/disconnect-*
+Carthage
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "SnapKit"]
-	path = SnapKit
-	url = https://github.com/SnapKit/SnapKit.git
-[submodule "GCDWebServer"]
-	path = GCDWebServer
-	url = https://github.com/swisspol/GCDWebServer.git

diff --git a/Blockzilla.xcodeproj/project.pbxproj b/Blockzilla.xcodeproj/project.pbxproj
diff --git a/Cartfile b/Cartfile
@@ -0,0 +1,2 @@
+github "swisspol/GCDWebServer"
+github "SnapKit/SnapKit"       "0.16.0"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1,2 @@
+github "swisspol/GCDWebServer" "3.3"
+github "SnapKit/SnapKit" "0.16.0"
diff --git a/GCDWebServer b/GCDWebServer
diff --git a/README.md b/README.md
@@ -18,7 +18,23 @@ We encourage you to participate in this open source project. We love Pull Reques
 Build Instructions
 ------------------
 
-Run `./checkout.sh` to pull in dependencies and generate the block list. After that you can open the Xcode project and build the app.
+1. Install the latest [Xcode developer tools](https://developer.apple.com/xcode/downloads/) from Apple.
+1. Install [Carthage](https://github.com/Carthage/Carthage#installing-carthage).
+1. Clone the repository:
+
+  ```shell
+  git clone https://github.com/mozilla/focus
+  ```
+
+1. Pull in the project dependencies:
+
+  ```shell
+  cd focus
+  ./checkout.sh
+  ```
+
+1. Open `Blockzilla.xcodeproj` in Xcode.
+1. Build the `Focus` scheme in Xcode.
 
 Building for Distribution
 -------------------------

diff --git a/SnapKit b/SnapKit
diff --git a/checkout.sh b/checkout.sh
@@ -4,6 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-git submodule init
-git submodule update
 ./build-disconnect.py
+
+carthage checkout
+carthage build --platform iOS
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,3 +28,4 @@ DerivedData
		.idea

		Lists/disconnect-*
		Carthage
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		github "swisspol/GCDWebServer"
		github "SnapKit/SnapKit" "0.16.0"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		github "swisspol/GCDWebServer" "3.3"
		github "SnapKit/SnapKit" "0.16.0"