Skip to content
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

Bumped the min deployment target to iOS 9+, Xcode to Xcode 11 #2

Merged
merged 1 commit into from
Feb 19, 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
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ DerivedData
.bundle

# Add this line if you want to avoid checking in source code from Carthage dependencies.
Carthage/
Carthage/Checkouts
Carthage/Build

# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
Expand All @@ -32,4 +33,9 @@ Carthage/
# Note: if you ignore the Pods directory, make sure to uncomment
# `pod install` in .travis.yml
#
Pods/
Example/Pods
Example/Podfile.lock

# SwiftPM
.swiftpm
.build
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

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

45 changes: 45 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
language: objective-c
osx_image: xcode11.2

env:
global:
- LC_CTYPE=en_US.UTF-8
- LANG=en_US.UTF-8

addons:
ssh_known_hosts: github.com

notifications:
email: false

before_install:
- env
- locale
- gem install cocoapods --no-document --quiet
- gem install xcpretty --no-document --quiet
- pod --version
- pod repo update --silent
- xcpretty --version
- xcodebuild -version
- xcodebuild -showsdks

script:
- set -o pipefail

- echo Check if the library described by the podspec can be built
- pod lib lint --allow-warnings

- echo Build example
- pod install --project-directory=Example
- xcodebuild build -workspace Example/SDWebImageVideoCoder.xcworkspace -scheme SDWebImageVideoCoder-Example -destination 'platform=iOS Simulator,name=iPhone 11 Pro' -configuration Debug | xcpretty -c

- echo Clean DerivedData
- rm -rf ~/Library/Developer/Xcode/DerivedData/
- mkdir DerivedData

- echo Run the tests
- xcodebuild test -workspace Example/SDWebImageVideoCoder.xcworkspace -scheme 'SDWebImageVideoCoder_Tests' -destination 'platform=iOS Simulator,name=iPhone 11 Pro' -configuration Debug | xcpretty -c
- mv ~/Library/Developer/Xcode/DerivedData/ ./DerivedData/iOS

after_success:
- bash <(curl -s https://codecov.io/bash) -D './DerivedData/iOS' -J '^SDWebImageVideoCoder$' -F 'iOS'
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "SDWebImage/SDWebImage" ~> 5.3
github "SDWebImage/SDWebImage" ~> 5.10
2 changes: 1 addition & 1 deletion Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use_frameworks!

platform :ios, '8.0'
platform :ios, '9.0'

target 'SDWebImageVideoCoder_Example' do
pod 'SDWebImageVideoCoder', :path => '../'
Expand Down
25 changes: 0 additions & 25 deletions Example/Podfile.lock

This file was deleted.

6 changes: 3 additions & 3 deletions SDWebImageVideoCoder.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ This is just a toy coder plugin for SDWebImage. Which aim to provide a demo usag
s.author = { 'DreamPiggy' => '[email protected]' }
s.source = { :git => 'https://github.com/SDWebImage/SDWebImageVideoCoder.git', :tag => s.version.to_s }

s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.10'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.11'
s.tvos.deployment_target = '9.0'

s.source_files = 'SDWebImageVideoCoder/Classes/**/*', 'SDWebImageVideoCoder/Module/SDWebImageVideoCoder.h'
s.dependency 'SDWebImage', '~> 5.3'
s.dependency 'SDWebImage', '~> 5.10'
end
12 changes: 6 additions & 6 deletions SDWebImageVideoCoder.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -366,11 +366,13 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TVOS_DEPLOYMENT_TARGET = 9.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down Expand Up @@ -421,10 +423,12 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
TVOS_DEPLOYMENT_TARGET = 9.0;
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down Expand Up @@ -503,7 +507,6 @@
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.SDWebImageVideoCoder-macOS";
PRODUCT_NAME = SDWebImageVideoCoder;
SDKROOT = macosx;
Expand Down Expand Up @@ -531,7 +534,6 @@
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.SDWebImageVideoCoder-macOS";
PRODUCT_NAME = SDWebImageVideoCoder;
SDKROOT = macosx;
Expand Down Expand Up @@ -563,7 +565,6 @@
SDKROOT = appletvos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
name = Debug;
};
Expand Down Expand Up @@ -591,7 +592,6 @@
SDKROOT = appletvos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.0;
};
name = Release;
};
Expand Down