Merge pull request SwiftGit2#183 from DivineDominion/xcodeconfigs

update xcconfigs to support arm64 (& update other dev dependencies)
kaunteya · Dec 15, 2020 · cbb2207 · cbb2207
2 parents 712cfc5 + b253e02
commit cbb2207
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,4 +1,4 @@
-github "jspahrsummers/xcconfigs" ~> 1.0
+github "jspahrsummers/xcconfigs" ~> 1.1
 github "Quick/Quick" ~> 2.0
 github "Quick/Nimble" ~> 8.0
 github "ZipArchive/ZipArchive" ~> 2.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v8.0.1"
-github "Quick/Quick" "v2.0.0"
-github "ZipArchive/ZipArchive" "v2.1.5"
-github "jspahrsummers/xcconfigs" "1.0"
+github "Quick/Nimble" "v8.1.2"
+github "Quick/Quick" "v2.2.1"
+github "ZipArchive/ZipArchive" "v2.2.3"
+github "jspahrsummers/xcconfigs" "1.1"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
diff --git a/Carthage/Checkouts/ZipArchive b/Carthage/Checkouts/ZipArchive
diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs
+46 −0		.github/workflows/ci.yml
+1 −1		.hound.yml
+2 −0		.swiftlint.yml
+47 −40		.travis.yml
+1 −1		Cartfile.private
+1 −2		Cartfile.resolved
+0 −9		Carthage/Checkouts/CwlCatchException/Package.swift
+2 −0		Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/LICENSE.txt
+14 −0		Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/Package.swift
+1 −1		Carthage/Checkouts/CwlPreconditionTesting/Dependencies/CwlCatchException/README.md
+5 −5		...uts/CwlPreconditionTesting/Dependencies/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift
+2 −5		.../CwlPreconditionTesting/Dependencies/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m
+2 −5		...onditionTesting/Dependencies/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h
+19 −10		Carthage/Checkouts/CwlPreconditionTesting/Package.swift
+5 −19		Carthage/Checkouts/CwlPreconditionTesting/README.md
+32 −29		Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/CwlMachBadInstructionHandler.m
+9 −1		...heckouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/include/CwlMachBadInstructionHandler.h
+3 −4		Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.c
+8 −0		Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.h
+44 −44		Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift
+161 −148		Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift
+73 −73		Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstructionPosix.swift
+31 −31		Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlDarwinDefinitions.swift
+0 −29		Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/Posix/CwlPreconditionTesting_POSIX.h
+8 −5		Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/include/CwlPreconditionTesting.h
+1 −1		Gemfile
+37 −23		Gemfile.lock
+11 −8		Nimble.podspec
+56 −51		Nimble.xcodeproj/project.pbxproj
+1 −1		Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-iOS.xcscheme
+1 −1		Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-macOS.xcscheme
+1 −1		Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-tvOS.xcscheme
+8 −0		Package.resolved
+57 −13		Package.swift
+62 −0		[email protected]
+24 −1		README.md
+18 −18		Sources/Nimble/Adapters/NMBExpectation.swift
+2 −2		Sources/Nimble/Adapters/NimbleXCTestHandler.swift
+2 −2		Sources/Nimble/Expression.swift
+10 −6		Sources/Nimble/Matchers/BeCloseTo.swift
+6 −4		Sources/Nimble/Matchers/BeGreaterThan.swift
+6 −4		Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift
+2 −11		Sources/Nimble/Matchers/BeIdenticalTo.swift
+6 −4		Sources/Nimble/Matchers/BeLessThan.swift
+6 −4		Sources/Nimble/Matchers/BeLessThanOrEqual.swift
+5 −3		Sources/Nimble/Matchers/MatcherProtocols.swift
+60 −17		Sources/Nimble/Matchers/PostNotification.swift
+13 −10		Sources/Nimble/Matchers/RaisesException.swift
+6 −0		Sources/Nimble/Matchers/SatisfyAllOf.swift
+6 −0		Sources/Nimble/Matchers/SatisfyAnyOf.swift
+5 −5		Sources/Nimble/Matchers/ThrowAssertion.swift
+1 −5		Sources/Nimble/Nimble.h
+13 −9		Sources/Nimble/Utils/Await.swift
+2 −13		Sources/Nimble/Utils/Stringers.swift
+1 −67		Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m
+37 −3		Tests/NimbleTests/AsynchronousTest.swift
+1 −1		Tests/NimbleTests/Helpers/utils.swift
+2 −2		Tests/NimbleTests/Matchers/BeAKindOfTest.swift
+1 −1		Tests/NimbleTests/Matchers/BeAnInstanceOfTest.swift
+3 −3		Tests/NimbleTests/Matchers/BeEmptyTest.swift
+0 −2		Tests/NimbleTests/Matchers/BeGreaterThanOrEqualToTest.swift
+1 −1		Tests/NimbleTests/Matchers/BeIdenticalToTest.swift
+0 −2		Tests/NimbleTests/Matchers/BeLessThanOrEqualToTest.swift
+0 −2		Tests/NimbleTests/Matchers/BeginWithTest.swift
+1 −1		Tests/NimbleTests/Matchers/ContainTest.swift
+0 −2		Tests/NimbleTests/Matchers/EndWithTest.swift
+1 −11		Tests/NimbleTests/Matchers/EqualTest.swift
+2 −2		Tests/NimbleTests/Matchers/MatchErrorTest.swift
+13 −17		Tests/NimbleTests/Matchers/PostNotificationTest.swift
+1 −1		Tests/NimbleTests/Matchers/RaisesExceptionTest.swift
+1 −1		Tests/NimbleTests/Matchers/ThrowAssertionTest.swift
+1 −0		Tests/NimbleTests/XCTestManifests.swift
+2 −2		script/release
+17 −11		test
+1 −1		.github/ISSUE_TEMPLATE
+52 −0		.github/workflows/ci.yml
+15 −0		.github/workflows/swiftlint.yml
+0 −4		.hound.yml
+7 −4		.swiftlint.yml
+22 −18		.travis.yml
+1 −1		CONTRIBUTING.md
+1 −5		Dangerfile
+24 −2		Documentation/en-us/InstallingQuick.md
+71 −2		Documentation/en-us/SharedExamples.md
+1 −1		Documentation/ja/InstallingQuick.md
+4 −4		Documentation/ja/SharedExamples.md
+1 −1		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
+69 −49		Gemfile.lock
+2 −2		Package.resolved
+14 −5		Package.swift
+46 −0		[email protected]
+2 −2		Quick Templates/Quick Spec Class.xctemplate/Objective-C/___FILEBASENAME___.m
+7 −3		Quick.podspec
+237 −347		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
+1 −1		README.md
+8 −6		Rakefile
+8 −6		Sources/Quick/Behavior.swift
+17 −4		Sources/Quick/Callsite.swift
+22 −18		Sources/Quick/Configuration/Configuration.swift
+59 −20		Sources/Quick/Configuration/QuickConfiguration.swift
+16 −12		Sources/Quick/DSL/DSL.swift
+24 −23		Sources/Quick/DSL/World+DSL.swift
+7 −12		Sources/Quick/Example.swift
+7 −0		Sources/Quick/ExampleGroup.swift
+3 −1		Sources/Quick/ExampleMetadata.swift
+3 −1		Sources/Quick/Filter.swift
+1 −1		Sources/Quick/NSBundle+CurrentTestBundle.swift
+1 −8		Sources/Quick/QuickMain.swift
+42 −43		Sources/Quick/QuickSpec.swift
+69 −0		Sources/Quick/QuickTestObservation.swift
+4 −7		Sources/Quick/String+C99ExtendedIdentifier.swift
+40 −18		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
+4 −4		Tests/QuickTests/QuickTestHelpers/XCTestCaseProvider.swift
+5 −5		Tests/QuickTests/QuickTests/FunctionalTests/AfterEachTests.swift
+3 −3		Tests/QuickTests/QuickTests/FunctionalTests/BeforeEachTests.swift
+3 −3		Tests/QuickTests/QuickTests/FunctionalTests/BeforeSuiteTests.swift
+3 −5		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
+1 −1		Tests/QuickTests/QuickTests/FunctionalTests/ContextTests.swift
+18 −6		Tests/QuickTests/QuickTests/FunctionalTests/CurrentSpecTests.swift
+2 −2		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
+2 −2		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