Skip to content

Build it #713

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
May 7, 2021
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
18 changes: 1 addition & 17 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,17 @@
*.swp
*~.nib

build/*
.build/*
build-iPhoneSimulator/*
build-iPhoneOS/*
objective-git.bridgesupport
ObjectiveGitFramework/build/*
ObjectiveGit-iOS.framework/*
External/libgit2*.a
External/libgit2-ios

*.pbxuser
*.perspective
*.perspectivev3

*.mode1v3
*.mode2v3

project.xcworkspace
*/xcuserdata/
*.xccheckout
*.xcscmblueprint

ObjectiveGitTests/fixtures/Fixtures/*

External/ios-openssl/include
External/ios-openssl/lib
External/libssh2-ios

External/libgit2-mac.a
Carthage/Build

8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,15 @@
#
---
os: osx
osx_image: xcode9.3
osx_image: xcode12.2
language: objective-c

matrix:
fast_finish: true
include:
- osx_image: xcode9.3
env:
- env:
- SCHEME="ObjectiveGit Mac"
- osx_image: xcode9.3
env:
- env:
- SCHEME="ObjectiveGit iOS"

before_install:
Expand Down
6 changes: 3 additions & 3 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "jspahrsummers/xcconfigs" "master"
github "Quick/Quick" ~> 1.3.4
github "Quick/Nimble" ~> 7.3.3
github "ZipArchive/ZipArchive" ~> 2.1.4
github "Quick/Quick" ~> 2.1.0
github "Quick/Nimble" ~> 8.0.1
github "ZipArchive/ZipArchive" ~> 2.2.3
8 changes: 4 additions & 4 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "Quick/Nimble" "v7.3.3"
github "Quick/Quick" "v1.3.4"
github "ZipArchive/ZipArchive" "v2.1.4"
github "jspahrsummers/xcconfigs" "bb795558a76e5daf3688500055bbcfe243bffa8d"
github "Quick/Nimble" "v8.1.2"
github "Quick/Quick" "v2.2.1"
github "ZipArchive/ZipArchive" "v2.2.3"
github "jspahrsummers/xcconfigs" "4ced0ad5a971220917994a4edfa6abf9702e3818"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 128 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Submodule Quick updated 96 files
+1 −1 .github/ISSUE_TEMPLATE
+52 −0 .github/workflows/ci.yml
+15 −0 .github/workflows/swiftlint.yml
+0 −2 .hound.yml
+1 −1 .swift-version
+7 −4 .swiftlint.yml
+48 −48 .travis.yml
+1 −1 CONTRIBUTING.md
+3 −7 Dangerfile
+24 −2 Documentation/en-us/InstallingQuick.md
+72 −3 Documentation/en-us/SharedExamples.md
+1 −1 Documentation/ja/InstallingQuick.md
+4 −4 Documentation/ja/SharedExamples.md
+1 −1 Documentation/ko-kr/BehavioralTesting.md
+2 −2 Documentation/ko-kr/InstallingQuick.md
+3 −3 Documentation/ko-kr/SharedExamples.md
+4 −4 Documentation/pt-br/SharedExamples.md
+1 −1 Documentation/zh-cn/InstallingQuick.md
+3 −3 Documentation/zh-cn/SharedExamples.md
+1 −1 Externals/Nimble
+1 −2 Gemfile
+80 −60 Gemfile.lock
+2 −2 Package.resolved
+39 −37 Package.swift
+12 −6 [email protected]
+1 −1 Quick Templates/Quick Configuration Class.xctemplate/Objective-C/___FILEBASENAME___.h
+1 −1 Quick Templates/Quick Configuration Class.xctemplate/Objective-C/___FILEBASENAME___.m
+1 −1 Quick Templates/Quick Configuration Class.xctemplate/Swift/___FILEBASENAME___.swift
+3 −3 Quick Templates/Quick Spec Class.xctemplate/Objective-C/___FILEBASENAME___.m
+1 −1 Quick Templates/Quick Spec Class.xctemplate/Swift/___FILEBASENAME___.swift
+10 −3 Quick.podspec
+243 −353 Quick.xcodeproj/project.pbxproj
+1 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-iOS.xcscheme
+20 −14 Quick.xcodeproj/xcshareddata/xcschemes/Quick-macOS.xcscheme
+1 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-tvOS.xcscheme
+8 −0 Quick.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+3 −1 README.md
+12 −7 Rakefile
+8 −6 Sources/Quick/Behavior.swift
+19 −12 Sources/Quick/Callsite.swift
+24 −20 Sources/Quick/Configuration/Configuration.swift
+59 −20 Sources/Quick/Configuration/QuickConfiguration.swift
+16 −12 Sources/Quick/DSL/DSL.swift
+25 −24 Sources/Quick/DSL/World+DSL.swift
+1 −1 Sources/Quick/ErrorUtility.swift
+9 −20 Sources/Quick/Example.swift
+7 −0 Sources/Quick/ExampleGroup.swift
+5 −9 Sources/Quick/ExampleMetadata.swift
+5 −9 Sources/Quick/Filter.swift
+2 −2 Sources/Quick/NSBundle+CurrentTestBundle.swift
+3 −10 Sources/Quick/QuickMain.swift
+1 −1 Sources/Quick/QuickSelectedTestSuiteBuilder.swift
+43 −52 Sources/Quick/QuickSpec.swift
+69 −0 Sources/Quick/QuickTestObservation.swift
+1 −1 Sources/Quick/QuickTestSuite.swift
+5 −8 Sources/Quick/String+C99ExtendedIdentifier.swift
+43 −27 Sources/Quick/World.swift
+5 −22 Sources/QuickObjCRuntime/QuickSpecBase.m
+7 −0 Sources/QuickObjCRuntime/include/QuickSpecBase.h
+2 −43 Sources/QuickObjectiveC/Configuration/QuickConfiguration.m
+1 −1 Sources/QuickObjectiveC/QuickSpec.h
+43 −33 Sources/QuickObjectiveC/QuickSpec.m
+0 −11 Sources/QuickSpecBase/include/QuickSpecBase.h
+5 −0 Tests/.swiftlint.yml
+16 −15 Tests/LinuxMain.swift
+20 −0 Tests/QuickIssue853RegressionTests/SubclassOfSubclassWithStructPropertyTests.swift
+13 −2 Tests/QuickTests/QuickFocusedTests/FocusedTests.swift
+0 −30 Tests/QuickTests/QuickTestHelpers/SpecRunner.swift
+0 −9 Tests/QuickTests/QuickTestHelpers/TestRun.swift
+5 −5 Tests/QuickTests/QuickTestHelpers/XCTestCaseProvider.swift
+6 −6 Tests/QuickTests/QuickTests/FunctionalTests/AfterEachTests.swift
+4 −4 Tests/QuickTests/QuickTests/FunctionalTests/BeforeEachTests.swift
+3 −3 Tests/QuickTests/QuickTests/FunctionalTests/BeforeSuiteTests.swift
+4 −6 Tests/QuickTests/QuickTests/FunctionalTests/BehaviorTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/Configuration/AfterEach/Configuration+AfterEachTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/Configuration/BeforeEach/Configuration+BeforeEachTests.swift
+2 −2 Tests/QuickTests/QuickTests/FunctionalTests/ContextTests.swift
+18 −6 Tests/QuickTests/QuickTests/FunctionalTests/CurrentSpecTests.swift
+3 −3 Tests/QuickTests/QuickTests/FunctionalTests/DescribeTests.swift
+16 −14 Tests/QuickTests/QuickTests/FunctionalTests/ItTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/ObjC/ItTests+ObjC.m
+13 −1 Tests/QuickTests/QuickTests/FunctionalTests/PendingTests.swift
+52 −0 Tests/QuickTests/QuickTests/FunctionalTests/QuickSpec_SelectedTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/SharedExamples+BeforeEachTests.swift
+3 −3 Tests/QuickTests/QuickTests/FunctionalTests/SharedExamplesTests.swift
+8 −23 Tests/QuickTests/QuickTests/Helpers/QCKSpecRunner.m
+24 −0 Tests/QuickTests/QuickTests/Helpers/QuickSpec+MethodList.swift
+0 −17 Tests/QuickTests/QuickTests/Helpers/QuickSpec+QuickSpec_MethodList.h
+0 −23 Tests/QuickTests/QuickTests/Helpers/QuickSpec+QuickSpec_MethodList.m
+101 −0 Tests/QuickTests/QuickTests/Helpers/QuickSpecRunner.swift
+1 −2 Tests/QuickTests/QuickTests/Helpers/QuickTestsBridgingHeader.h
+0 −20 Tests/QuickTests/QuickTests/Helpers/XCTestObservationCenter+QCKSuspendObservation.h
+0 −54 Tests/QuickTests/QuickTests/Helpers/XCTestObservationCenter+QCKSuspendObservation.m
+64 −0 Tests/QuickTests/QuickTests/Helpers/XCTestObservationCenter+QCKSuspendObservation.swift
+1 −1 script/release
+0 −4 script/travis-install-macos
2 changes: 1 addition & 1 deletion Carthage/Checkouts/ZipArchive
Submodule ZipArchive updated 159 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/xcconfigs
680 changes: 591 additions & 89 deletions ObjectiveGitFramework.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8DC2EF4F0486A6940098B216"
BuildableName = "ObjectiveGit.framework"
BlueprintName = "ObjectiveGit-Mac"
ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -95,17 +104,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8DC2EF4F0486A6940098B216"
BuildableName = "ObjectiveGit.framework"
BlueprintName = "ObjectiveGit-Mac"
ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -127,8 +125,6 @@
ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Profile"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D01B6ED219F82E2000D411BC"
BuildableName = "ObjectiveGit.framework"
BlueprintName = "ObjectiveGit-iOS"
ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -81,17 +90,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D01B6ED219F82E2000D411BC"
BuildableName = "ObjectiveGit.framework"
BlueprintName = "ObjectiveGit-iOS"
ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -112,8 +110,6 @@
ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Profile"
Expand Down
9 changes: 0 additions & 9 deletions ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>
6 changes: 3 additions & 3 deletions script/cibuild
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ if [ "$SCHEME" == "ObjectiveGit Mac" ]; then
-scheme "$SCHEME" \
${XCODE_OPTIONS[*]} \
build test \
2>&1 | xcpretty $XCPRETTY_FORMAT_OPTIONS
2>&1 #| xcpretty $XCPRETTY_FORMAT_OPTIONS
elif [ "$SCHEME" == "ObjectiveGit iOS" ]; then
echo "*** Prebuilding OpenSSL"
"$SCRIPT_DIR/update_libssl_ios"
Expand All @@ -69,9 +69,9 @@ elif [ "$SCHEME" == "ObjectiveGit iOS" ]; then

xcodebuild -workspace "$XCWORKSPACE" \
-scheme "$SCHEME" \
-destination "platform=iOS Simulator,name=iPhone 5" \
-destination "platform=iOS Simulator,name=iPhone 11" \
-sdk iphonesimulator \
${XCODE_OPTIONS[*]} \
build test \
2>&1 | xcpretty $XCPRETTY_FORMAT_OPTIONS
2>&1 #| xcpretty $XCPRETTY_FORMAT_OPTIONS
fi
8 changes: 4 additions & 4 deletions script/update_libgit2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -e
# ~/.MacOSX/environment.plist
PATH="/usr/local/bin:$PATH"

if [ "External/libgit2.a" -nt "External/libgit2" ]
if [ "External/libgit2-mac.a" -nt "External/libgit2" ]
then
echo "No update needed."
exit 0
Expand All @@ -33,9 +33,9 @@ cmake -DBUILD_SHARED_LIBS:BOOL=OFF \
cmake --build .

product="libgit2.a"
install_path="../../${product}"
if [ "${product}" -nt "${install_path}" ]; then
cp -v "${product}" "${install_path}"
install_path="../../"
if [ "libgit2.a" -nt "${install_path}/libgit2-mac.a" ]; then
cp -v "libgit2.a" "${install_path}/libgit2-mac.a"
fi

echo "libgit2 has been updated."