From 5a353d2b70b36807f76c325174527188931944c9 Mon Sep 17 00:00:00 2001 From: Hiroki Kumamoto Date: Fri, 24 Apr 2020 12:33:06 +0900 Subject: [PATCH 1/6] Update dependencies --- Cartfile.resolved | 6 +++--- Carthage/Checkouts/Nimble | 2 +- Carthage/Checkouts/Quick | 2 +- Carthage/Checkouts/SnapKit | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index e36a1ab..f67439a 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -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" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index cd6dfb8..7fd118e 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit cd6dfb86f496fcd96ce0bc6da962cd936bf41903 +Subproject commit 7fd118ec8795888bcbbebc1a41f6984454c4cd6f diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick index 5fbf138..33682c2 160000 --- a/Carthage/Checkouts/Quick +++ b/Carthage/Checkouts/Quick @@ -1 +1 @@ -Subproject commit 5fbf13871d185526993130c3a1fad0b70bfe37ce +Subproject commit 33682c2f6230c60614861dfc61df267e11a1602f diff --git a/Carthage/Checkouts/SnapKit b/Carthage/Checkouts/SnapKit index 2f5a5da..d458564 160000 --- a/Carthage/Checkouts/SnapKit +++ b/Carthage/Checkouts/SnapKit @@ -1 +1 @@ -Subproject commit 2f5a5da2458a4ae0fcd7d4a27e98a54d7f235af1 +Subproject commit d458564516e5676af9c70b4f4b2a9178294f1bc6 From 8d3c78c368c17924edc3500aa1a2fd95a36e63f5 Mon Sep 17 00:00:00 2001 From: Hiroki Kumamoto Date: Fri, 24 Apr 2020 12:33:17 +0900 Subject: [PATCH 2/6] Set deployment target to 10.0 --- PlayerKit.xcodeproj/project.pbxproj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PlayerKit.xcodeproj/project.pbxproj b/PlayerKit.xcodeproj/project.pbxproj index c2561d6..5a7083c 100644 --- a/PlayerKit.xcodeproj/project.pbxproj +++ b/PlayerKit.xcodeproj/project.pbxproj @@ -635,6 +635,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 67916D331BAE8A87004419B0; @@ -1088,7 +1089,7 @@ 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; @@ -1143,7 +1144,7 @@ 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; From 5d1f1ac8c5fb1fb1bc74f19d5338a5352392aa70 Mon Sep 17 00:00:00 2001 From: Hiroki Kumamoto Date: Fri, 24 Apr 2020 12:50:48 +0900 Subject: [PATCH 3/6] Update travis ci osx_image --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0c70c07..0a4c614 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -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 From 9a0855e25708728ed948cb7d9c34a69200dbec56 Mon Sep 17 00:00:00 2001 From: Hiroki Kumamoto Date: Fri, 24 Apr 2020 17:37:49 +0900 Subject: [PATCH 4/6] Don't support catalyst --- PlayerKit.xcodeproj/project.pbxproj | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/PlayerKit.xcodeproj/project.pbxproj b/PlayerKit.xcodeproj/project.pbxproj index 5a7083c..e3956dd 100644 --- a/PlayerKit.xcodeproj/project.pbxproj +++ b/PlayerKit.xcodeproj/project.pbxproj @@ -1093,7 +1093,6 @@ 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"; @@ -1147,7 +1146,6 @@ 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"; @@ -1175,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; }; @@ -1198,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; }; From cb213ee60487e33624f9726448676fe127c823a7 Mon Sep 17 00:00:00 2001 From: Hiroki Kumamoto Date: Fri, 24 Apr 2020 17:40:42 +0900 Subject: [PATCH 5/6] Fix Makefile xcodebuild option --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7faa97e..3eb0b4a 100644 --- a/Makefile +++ b/Makefile @@ -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 From 2c9d1b9eaf23c1a6e6da5b02088f632a7884dd52 Mon Sep 17 00:00:00 2001 From: Hiroki Kumamoto Date: Fri, 24 Apr 2020 18:36:37 +0900 Subject: [PATCH 6/6] Add --verbose option to carthage --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0a4c614..c9345f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,6 @@ 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