Skip to content

Xcode 7.3 Support #567

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.

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 12 commits into from
Apr 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 9 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 133 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Submodule Quick updated 59 files
+1 −1 .swift-version
+1 −1 .travis.yml
+1 −1 Documentation/en-us/ArrangeActAssert.md
+1 −1 Documentation/en-us/BehavioralTesting.md
+0 −0 Documentation/en-us/ConfiguringQuick.md
+0 −0 Documentation/en-us/InstallingFileTemplates.md
+8 −0 Documentation/en-us/InstallingQuick.md
+0 −0 Documentation/en-us/MoreResources.md
+0 −0 Documentation/en-us/NimbleAssertions.md
+0 −0 Documentation/en-us/QuickExamplesAndGroups.md
+0 −0 Documentation/en-us/QuickInObjectiveC.md
+2 −2 Documentation/en-us/README.md
+0 −0 Documentation/en-us/SettingUpYourXcodeProject.md
+0 −0 Documentation/en-us/SharedExamples.md
+0 −0 Documentation/en-us/TestingApps.md
+213 −0 Documentation/ja/ArrangeActAssert.md
+83 −0 Documentation/ja/BehavioralTesting.md
+101 −0 Documentation/ja/ConfiguringQuick.md
+26 −0 Documentation/ja/InstallingFileTemplates.md
+152 −0 Documentation/ja/InstallingQuick.md
+27 −0 Documentation/ja/MoreResources.md
+100 −0 Documentation/ja/NimbleAssertions.md
+477 −0 Documentation/ja/QuickExamplesAndGroups.md
+49 −0 Documentation/ja/QuickInObjectiveC.md
+46 −0 Documentation/ja/README.md
+77 −0 Documentation/ja/SettingUpYourXcodeProject.md
+126 −0 Documentation/ja/SharedExamples.md
+175 −0 Documentation/ja/TestingApps.md
+1 −1 Externals/Nimble
+1 −1 Quick.podspec
+14 −0 Quick.xcodeproj/project.pbxproj
+3 −3 README.md
+5 −5 Sources/Quick/DSL/DSL.swift
+1 −1 Sources/Quick/Example.swift
+7 −0 Sources/Quick/QuickMain.swift
+7 −5 Sources/Quick/QuickSpec.h
+1 −1 Sources/Quick/QuickSpec.swift
+2 −2 Sources/Quick/World.swift
+1 −1 Sources/QuickFocusedTests/FocusedTests.swift
+7 −2 Sources/QuickTestHelpers/SpecRunner.swift
+1 −1 Sources/QuickTests/FunctionalTests/AfterEachTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/AfterSuiteTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/BeforeEachTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/BeforeSuiteTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/Configuration/AfterEach/Configuration+AfterEachTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/Configuration/BeforeEach/Configuration+BeforeEachTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/DescribeTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/ItTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/PendingTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/SharedExamples+BeforeEachTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/SharedExamplesTests.swift
+1 −1 Sources/QuickTests/Helpers/QCKSpecRunner.m
+1 −1 Sources/QuickTests/Helpers/XCTestCaseProvider.swift
+7 −11 Sources/QuickTests/Helpers/XCTestObservationCenter+QCKSuspendObservation.h
+30 −0 Sources/QuickTests/Helpers/XCTestObservationCenter+QCKSuspendObservation.m
+4 −13 circle.yml
+2 −2 script/release
+2 −4 script/travis-install-osx
+1 −7 script/travis-script-osx
4 changes: 0 additions & 4 deletions ObjectiveGitFramework.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (
.,
Expand Down Expand Up @@ -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 = (
.,
Expand Down Expand Up @@ -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 = (
.,
Expand Down Expand Up @@ -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 = (
.,
Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGitTests/GTOIDSpec.m
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion ObjectiveGitTests/GTSignatureSpec.m
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
23 changes: 13 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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.

Expand Down
18 changes: 0 additions & 18 deletions script/LICENSE.md

This file was deleted.

82 changes: 0 additions & 82 deletions script/README.md

This file was deleted.

Loading