Skip to content

Commit 65084c3

Browse files
authored
Merge pull request #2 from SDWebImage/xcode11
Bumped the min deployment target to iOS 9+, Xcode to Xcode 11
2 parents 4715fe6 + 2a8934e commit 65084c3

File tree

8 files changed

+71
-38
lines changed

8 files changed

+71
-38
lines changed

.gitignore

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ DerivedData
2323
.bundle
2424

2525
# Add this line if you want to avoid checking in source code from Carthage dependencies.
26-
Carthage/
26+
Carthage/Checkouts
27+
Carthage/Build
2728

2829
# We recommend against adding the Pods directory to your .gitignore. However
2930
# you should judge for yourself, the pros and cons are mentioned at:
@@ -32,4 +33,9 @@ Carthage/
3233
# Note: if you ignore the Pods directory, make sure to uncomment
3334
# `pod install` in .travis.yml
3435
#
35-
Pods/
36+
Example/Pods
37+
Example/Podfile.lock
38+
39+
# SwiftPM
40+
.swiftpm
41+
.build

.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.travis.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
language: objective-c
2+
osx_image: xcode11.2
3+
4+
env:
5+
global:
6+
- LC_CTYPE=en_US.UTF-8
7+
- LANG=en_US.UTF-8
8+
9+
addons:
10+
ssh_known_hosts: github.com
11+
12+
notifications:
13+
email: false
14+
15+
before_install:
16+
- env
17+
- locale
18+
- gem install cocoapods --no-document --quiet
19+
- gem install xcpretty --no-document --quiet
20+
- pod --version
21+
- pod repo update --silent
22+
- xcpretty --version
23+
- xcodebuild -version
24+
- xcodebuild -showsdks
25+
26+
script:
27+
- set -o pipefail
28+
29+
- echo Check if the library described by the podspec can be built
30+
- pod lib lint --allow-warnings
31+
32+
- echo Build example
33+
- pod install --project-directory=Example
34+
- xcodebuild build -workspace Example/SDWebImageVideoCoder.xcworkspace -scheme SDWebImageVideoCoder-Example -destination 'platform=iOS Simulator,name=iPhone 11 Pro' -configuration Debug | xcpretty -c
35+
36+
- echo Clean DerivedData
37+
- rm -rf ~/Library/Developer/Xcode/DerivedData/
38+
- mkdir DerivedData
39+
40+
- echo Run the tests
41+
- xcodebuild test -workspace Example/SDWebImageVideoCoder.xcworkspace -scheme 'SDWebImageVideoCoder_Tests' -destination 'platform=iOS Simulator,name=iPhone 11 Pro' -configuration Debug | xcpretty -c
42+
- mv ~/Library/Developer/Xcode/DerivedData/ ./DerivedData/iOS
43+
44+
after_success:
45+
- bash <(curl -s https://codecov.io/bash) -D './DerivedData/iOS' -J '^SDWebImageVideoCoder$' -F 'iOS'

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "SDWebImage/SDWebImage" ~> 5.3
1+
github "SDWebImage/SDWebImage" ~> 5.10

Example/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use_frameworks!
22

3-
platform :ios, '8.0'
3+
platform :ios, '9.0'
44

55
target 'SDWebImageVideoCoder_Example' do
66
pod 'SDWebImageVideoCoder', :path => '../'

Example/Podfile.lock

Lines changed: 0 additions & 25 deletions
This file was deleted.

SDWebImageVideoCoder.podspec

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

29-
s.ios.deployment_target = '8.0'
30-
s.osx.deployment_target = '10.10'
29+
s.ios.deployment_target = '9.0'
30+
s.osx.deployment_target = '10.11'
3131
s.tvos.deployment_target = '9.0'
3232

3333
s.source_files = 'SDWebImageVideoCoder/Classes/**/*', 'SDWebImageVideoCoder/Module/SDWebImageVideoCoder.h'
34-
s.dependency 'SDWebImage', '~> 5.3'
34+
s.dependency 'SDWebImage', '~> 5.10'
3535
end

SDWebImageVideoCoder.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -366,11 +366,13 @@
366366
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
367367
GCC_WARN_UNUSED_FUNCTION = YES;
368368
GCC_WARN_UNUSED_VARIABLE = YES;
369-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
369+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
370+
MACOSX_DEPLOYMENT_TARGET = 10.11;
370371
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
371372
MTL_FAST_MATH = YES;
372373
ONLY_ACTIVE_ARCH = YES;
373374
SDKROOT = iphoneos;
375+
TVOS_DEPLOYMENT_TARGET = 9.0;
374376
VERSIONING_SYSTEM = "apple-generic";
375377
VERSION_INFO_PREFIX = "";
376378
};
@@ -421,10 +423,12 @@
421423
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
422424
GCC_WARN_UNUSED_FUNCTION = YES;
423425
GCC_WARN_UNUSED_VARIABLE = YES;
424-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
426+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
427+
MACOSX_DEPLOYMENT_TARGET = 10.11;
425428
MTL_ENABLE_DEBUG_INFO = NO;
426429
MTL_FAST_MATH = YES;
427430
SDKROOT = iphoneos;
431+
TVOS_DEPLOYMENT_TARGET = 9.0;
428432
VALIDATE_PRODUCT = YES;
429433
VERSIONING_SYSTEM = "apple-generic";
430434
VERSION_INFO_PREFIX = "";
@@ -503,7 +507,6 @@
503507
"@executable_path/../Frameworks",
504508
"@loader_path/Frameworks",
505509
);
506-
MACOSX_DEPLOYMENT_TARGET = 10.10;
507510
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.SDWebImageVideoCoder-macOS";
508511
PRODUCT_NAME = SDWebImageVideoCoder;
509512
SDKROOT = macosx;
@@ -531,7 +534,6 @@
531534
"@executable_path/../Frameworks",
532535
"@loader_path/Frameworks",
533536
);
534-
MACOSX_DEPLOYMENT_TARGET = 10.10;
535537
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.SDWebImageVideoCoder-macOS";
536538
PRODUCT_NAME = SDWebImageVideoCoder;
537539
SDKROOT = macosx;
@@ -563,7 +565,6 @@
563565
SDKROOT = appletvos;
564566
SKIP_INSTALL = YES;
565567
TARGETED_DEVICE_FAMILY = 3;
566-
TVOS_DEPLOYMENT_TARGET = 9.0;
567568
};
568569
name = Debug;
569570
};
@@ -591,7 +592,6 @@
591592
SDKROOT = appletvos;
592593
SKIP_INSTALL = YES;
593594
TARGETED_DEVICE_FAMILY = 3;
594-
TVOS_DEPLOYMENT_TARGET = 9.0;
595595
};
596596
name = Release;
597597
};

0 commit comments

Comments
 (0)