Merge pull request #567 from phatblat/ben/quick-nimble

Xcode 7.3 Support

Author: pietbrauer

.travis.yml

@@ -1,14 +1,17 @@
 osx_image: xcode7
 language: objective-c
 matrix:
+  fast_finish: true
   include:
-    - osx_image: xcode7
-      env: SCHEME="ObjectiveGit Mac"
-    - osx_image: xcode7
-      env: SCHEME="ObjectiveGit iOS"
+    - osx_image: xcode7.3
+      env:
+        - SCHEME="ObjectiveGit Mac"
+    - osx_image: xcode7.3
+      env:
+        - SCHEME="ObjectiveGit iOS"
 before_install:
-  - brew update
-  - brew outdated xctool || brew upgrade xctool
+  - gem install xcpretty
+  - gem install xcpretty-travis-formatter
 install: script/bootstrap
 script: script/cibuild
 notifications:

Cartfile.private

@@ -1,4 +1,4 @@
 github "jspahrsummers/xcconfigs" >= 0.7.1
-github "Quick/Quick" ~> 0.9.1
-github "Quick/Nimble" ~> 3.1
+github "Quick/Quick" ~> 0.9.2
+github "Quick/Nimble" ~> 4.0
 github "ZipArchive/ZipArchive" ~> 1.1

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v3.1.0"
-github "Quick/Quick" "v0.9.1"
+github "Quick/Nimble" "v4.0.0"
+github "Quick/Quick" "v0.9.2"
 github "ZipArchive/ZipArchive" "v1.1"
 github "jspahrsummers/xcconfigs" "0.9"

Carthage/Checkouts/Nimble

@@ -2235,7 +2235,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					.,
@@ -2281,7 +2280,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					.,
@@ -2328,7 +2326,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					.,
@@ -2375,7 +2372,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					.,

Carthage/Checkouts/Quick

@@ -48,7 +48,7 @@
 	const git_oid *git_oid = NULL;
 
 	{
-		GTOID *testOID __attribute__((objc_precise_lifetime)) = [[GTOID alloc] initWithSHA:testSHA];
+		GTOID *testOID = [[GTOID alloc] initWithSHA:testSHA];
 		git_oid = testOID.git_oid;
 	}
 

ObjectiveGitFramework.xcodeproj/project.pbxproj

@@ -49,7 +49,7 @@
 	const git_signature *git_signature = NULL;
 
 	{
-		GTSignature *testSignature __attribute__((objc_precise_lifetime)) = [[GTSignature alloc] initWithName:name email:email time:time];
+		GTSignature *testSignature = [[GTSignature alloc] initWithName:name email:email time:time];
 		git_signature = testSignature.git_signature;
 	}
 

ObjectiveGitTests/GTOIDSpec.m

@@ -18,7 +18,7 @@ A brief summary of the available functionality:
 
 Not all libgit2 features are available, but if you run across something missing, please consider [contributing a pull request](#contributing)!
 
-Many classes in the ObjectiveGit API wrap a C struct from libgit2 and expose the underlying data and operations using Cocoa idioms. The underlying libgit2 types are prefixed with `git_` and are often accessible via a property so that your application can take advantage of the libgit2 API directly.
+Many classes in the ObjectiveGit API wrap a C struct from libgit2 and expose the underlying data and operations using Cocoa idioms. The underlying libgit2 types are prefixed with `git_` and are often accessible via a property so that your application can take advantage of the [libgit2 API](https://libgit2.github.com/libgit2/#HEAD) directly.
 
 The ObjectiveGit API makes extensive use of the Cocoa NSError pattern. The public API is also decorated with nullability attributes so that you will get compile-time feedback of whether nil is allowed or not. This also makes the framework much nicer to use in Swift.
 
@@ -32,15 +32,18 @@ or download them [manually](#manually).
 
 ### Other Tools
 
-To start building the framework, you must install the required dependencies,
-[xctool](https://github.com/facebook/xctool) and
-[cmake](https://github.com/Kitware/CMake). We recommend using
-[Homebrew](http://brew.sh) to install these tools.
-
-Once you have the dependencies you should clone this repository and then run [`script/bootstrap`](script/bootstrap). This will automatically pull down and install any other
-dependencies.
-
-Note that the `bootstrap` script automatically installs some libraries that ObjectiveGit relies upon, using Homebrew. If you not want to use Homebrew, you will need to ensure these dependent libraries and their headers are installed where the build scripts [expect them to be](https://github.com/libgit2/objective-git/blob/master/script/bootstrap#L80-L99).
+Simply run the [`script/bootstrap`](script/bootstrap) script to automatically install
+dependencies needed to start building the framework. This script uses
+[Homebrew](http://brew.sh) to install these tools. If your Mac does not have
+Homebrew, you will need to install the following manually:
+
+- [cmake](https://github.com/Kitware/CMake)
+- libtool
+- autoconf
+- automake
+- pkg-config
+- libssh2
+  - symlinks:  lib/libssh2.a include/libssh2.h include/libssh2_sftp.h include/libssh2_publickey.h
 
 To develop ObjectiveGit on its own, open the `ObjectiveGitFramework.xcworkspace` file.