Skip to content

Update dependencies #17

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.

Sign up for GitHub

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

Open
kumabook wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Update dependencies #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a353d2
Update dependencies
kumabook Apr 24, 2020
8d3c78c
Set deployment target to 10.0
kumabook Apr 24, 2020
5d1f1ac
Update travis ci osx_image
kumabook Apr 24, 2020
9a0855e
Don't support catalyst
kumabook Apr 24, 2020
cb213ee
Fix Makefile xcodebuild option
kumabook Apr 24, 2020
2c9d1b9
Add --verbose option to carthage
kumabook Apr 24, 2020
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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
osx_image: xcode10.1
osx_image: xcode11.3
language: objective-c
before_install: rvm use 2.4 --install --binary --fuzzy
install: bundle install --without=documentation
before_script:
- brew update
- brew install carthage || true
- carthage bootstrap --platform all
- carthage bootstrap --platform all --verbose
script: make
after_success: slather
6 changes: 3 additions & 3 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "Quick/Nimble" "v7.3.1"
github "Quick/Quick" "v1.3.2"
github "SnapKit/SnapKit" "4.2.0"
github "Quick/Nimble" "v8.0.7"
github "Quick/Quick" "v2.2.0"
github "SnapKit/SnapKit" "5.0.1"
github "youtube/youtube-ios-player-helper" "0.1.6"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Open in desktop
Submodule Nimble updated 127 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Open in desktop
Submodule Quick updated 82 files
+37 −0 .github/workflows/ci.yml
+4 −2 .hound.yml
+1 −1 .swift-version
+28 −46 .travis.yml
+2 −2 Dangerfile
+23 −1 Documentation/en-us/InstallingQuick.md
+72 −3 Documentation/en-us/SharedExamples.md
+2 −2 Documentation/ja/SharedExamples.md
+1 −1 Documentation/ko-kr/BehavioralTesting.md
+1 −1 Documentation/ko-kr/InstallingQuick.md
+2 −2 Documentation/ko-kr/SharedExamples.md
+3 −3 Documentation/pt-br/SharedExamples.md
+2 −2 Documentation/zh-cn/SharedExamples.md
+1 −1 Externals/Nimble
+1 −1 Gemfile
+50 −46 Gemfile.lock
+2 −2 Package.resolved
+35 −37 Package.swift
+6 −4 Package@swift-4.2.swift
+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
+1 −1 Quick Templates/Quick Spec Class.xctemplate/Objective-C/___FILEBASENAME___.m
+1 −1 Quick Templates/Quick Spec Class.xctemplate/Swift/___FILEBASENAME___.swift
+9 −3 Quick.podspec
+97 −51 Quick.xcodeproj/project.pbxproj
+1 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-iOS.xcscheme
+1 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-macOS.xcscheme
+1 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-tvOS.xcscheme
+8 −0 Quick.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+4 −1 README.md
+10 −7 Rakefile
+6 −2 Sources/Quick/Behavior.swift
+17 −12 Sources/Quick/Callsite.swift
+2 −2 Sources/Quick/Configuration/Configuration.swift
+59 −20 Sources/Quick/Configuration/QuickConfiguration.swift
+10 −10 Sources/Quick/DSL/DSL.swift
+15 −15 Sources/Quick/DSL/World+DSL.swift
+1 −1 Sources/Quick/ErrorUtility.swift
+7 −20 Sources/Quick/Example.swift
+7 −0 Sources/Quick/ExampleGroup.swift
+3 −9 Sources/Quick/ExampleMetadata.swift
+3 −9 Sources/Quick/Filter.swift
+2 −2 Sources/Quick/NSBundle+CurrentTestBundle.swift
+3 −10 Sources/Quick/QuickMain.swift
+1 −1 Sources/Quick/QuickSelectedTestSuiteBuilder.swift
+39 −48 Sources/Quick/QuickSpec.swift
+1 −1 Sources/Quick/QuickTestSuite.swift
+4 −7 Sources/Quick/String+C99ExtendedIdentifier.swift
+25 −25 Sources/Quick/World.swift
+2 −43 Sources/QuickObjectiveC/Configuration/QuickConfiguration.m
+1 −1 Sources/QuickObjectiveC/QuickSpec.h
+50 −24 Sources/QuickObjectiveC/QuickSpec.m
+5 −22 Sources/QuickSpecBase/QuickSpecBase.m
+1 −5 Sources/QuickSpecBase/include/QuickSpecBase.h
+18 −15 Tests/LinuxMain.swift
+4 −0 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
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/AfterEachTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/BeforeEachTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/BehaviorTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/ContextTests.swift
+18 −6 Tests/QuickTests/QuickTests/FunctionalTests/CurrentSpecTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/DescribeTests.swift
+10 −8 Tests/QuickTests/QuickTests/FunctionalTests/ItTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/ObjC/ItTests+ObjC.m
+52 −0 Tests/QuickTests/QuickTests/FunctionalTests/QuickSpec_SelectedTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/SharedExamplesTests.swift
+11 −0 Tests/QuickTests/QuickTests/FunctionalTests/SubclassOfSubclassWithStructPropertyTests.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
+93 −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/SnapKit
Open in desktop
Submodule SnapKit updated 30 files
+1 −0 .gitignore
+3 −3 .travis.yml
+45 −0 Package.swift
+13 −6 README.md
+6 −6 SnapKit.podspec
+23 −6 SnapKit.xcodeproj/project.pbxproj
+3 −0 SnapKit.xcworkspace/contents.xcworkspacedata
+8 −0 SnapKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+29 −0 SnapKitPlayground.playground/Contents.swift
+4 −0 SnapKitPlayground.playground/contents.xcplayground
+6 −0 SnapKitPlayground.playground/timeline.xctimeline
+44 −9 Source/Constraint.swift
+4 −0 Source/ConstraintAttributes.swift
+76 −10 Source/ConstraintConstantTarget.swift
+10 −1 Source/ConstraintDSL.swift
+49 −0 Source/ConstraintDirectionalInsetTarget.swift
+34 −0 Source/ConstraintDirectionalInsets.swift
+1 −1 Source/ConstraintLayoutGuide+Extensions.swift
+9 −1 Source/ConstraintMaker.swift
+8 −0 Source/ConstraintMakerEditable.swift
+11 −1 Source/ConstraintMakerExtendable.swift
+4 −4 Source/ConstraintMakerPriortizable.swift
+3 −1 Source/ConstraintMakerRelatable.swift
+6 −0 Source/ConstraintRelatableTarget.swift
+63 −63 Source/ConstraintView+Extensions.swift
+4 −4 Source/ConstraintViewDSL.swift
+12 −3 Source/Debugging.swift
+8 −4 Source/LayoutConstraint.swift
+1 −1 Source/UILayoutSupport+Extensions.swift
+148 −2 Tests/SnapKitTests/Tests.swift
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ XCODEBUILD:=xcodebuild
default: build test

build:
$(XCODEBUILD) -scheme PlayerKit-iOS
$(XCODEBUILD) -scheme PlayerKit-macOS
$(XCODEBUILD) -scheme PlayerKit-tvOS
$(XCODEBUILD) -target PlayerKit-iOS
$(XCODEBUILD) -target PlayerKit-macOS
$(XCODEBUILD) -target PlayerKit-tvOS

test:
$(XCODEBUILD) -scheme PlayerKit-macOS test
Expand Down
13 changes: 9 additions & 4 deletions PlayerKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = 67916D331BAE8A87004419B0;
Expand Down Expand Up @@ -1088,11 +1089,10 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down Expand Up @@ -1143,10 +1143,9 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down Expand Up @@ -1174,8 +1173,11 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.kumabook.PlayerKit;
PRODUCT_NAME = "$(PROJECT_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTS_MACCATALYST = NO;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
Expand All @@ -1197,8 +1199,11 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.kumabook.PlayerKit;
PRODUCT_NAME = "$(PROJECT_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTS_MACCATALYST = NO;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
Expand Down