From 712e12e23a8184d17b313cac27e1bef9a5784fc7 Mon Sep 17 00:00:00 2001 From: DreamPiggy Date: Tue, 2 Jul 2019 18:15:00 +0800 Subject: [PATCH 1/3] Follow App Store submit rule, upgrade the min Xcode version to Xcode 10.0 --- .github/ISSUE_TEMPLATE.md | 2 +- README.md | 2 +- SDWebImage/SDWebImageIndicator.m | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 3a2d6500..c39c7827 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -12,7 +12,7 @@ Platform Version | e.g. 12.0 / 10.14.0 / 12.0 / 5.0 SDWebImage Version | e.g. 5.0.0 / 4.4.0 Integration Method | e.g. carthage / cocoapods / manually - Xcode Version | e.g. Xcode 10 / Xcode 9 + Xcode Version | e.g. Xcode 11 / Xcode 10 Repro rate | e.g. all the time (100%) / sometimes x% / only once Repro with our demo prj | e.g. does it happen with our demo project? Demo project link | e.g. link to a demo project that highlights the issue diff --git a/README.md b/README.md index 5270e70c..575abbec 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ You can use those directly, or create similar components of your own. - tvOS 9.0 or later - watchOS 2.0 or later - macOS 10.10 or later -- Xcode 9.0 or later +- Xcode 10.0 or later #### Backwards compatibility diff --git a/SDWebImage/SDWebImageIndicator.m b/SDWebImage/SDWebImageIndicator.m index 458c38a5..e89d7260 100644 --- a/SDWebImage/SDWebImageIndicator.m +++ b/SDWebImage/SDWebImageIndicator.m @@ -18,7 +18,7 @@ #if __IPHONE_13_0 || __TVOS_13_0 || __MAC_10_15 // Xcode 11 #else -// Supports Xcode 9 && 10 users, for those users, define these enum +// Supports Xcode 10 users, for those users, define these enum static NSInteger UIActivityIndicatorViewStyleMedium = 100; static NSInteger UIActivityIndicatorViewStyleLarge = 101; #endif From 6ba2640ca4fc1973a1456efe315c1f94210c049d Mon Sep 17 00:00:00 2001 From: DreamPiggy Date: Tue, 2 Jul 2019 18:20:12 +0800 Subject: [PATCH 2/3] Update the storyboard with Xcode 10.2 version format --- Examples/SDWebImage Demo/LaunchScreen.storyboard | 4 ++-- .../Base.lproj/Main.storyboard | 16 +++++++++++----- .../Base.lproj/Main.storyboard | 4 ++-- .../Base.lproj/Interface.storyboard | 12 ++++++++---- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/Examples/SDWebImage Demo/LaunchScreen.storyboard b/Examples/SDWebImage Demo/LaunchScreen.storyboard index 12baca9e..c4475f53 100644 --- a/Examples/SDWebImage Demo/LaunchScreen.storyboard +++ b/Examples/SDWebImage Demo/LaunchScreen.storyboard @@ -1,11 +1,11 @@ - + - + diff --git a/Examples/SDWebImage OSX Demo/Base.lproj/Main.storyboard b/Examples/SDWebImage OSX Demo/Base.lproj/Main.storyboard index e4fce680..8986ad91 100644 --- a/Examples/SDWebImage OSX Demo/Base.lproj/Main.storyboard +++ b/Examples/SDWebImage OSX Demo/Base.lproj/Main.storyboard @@ -1,8 +1,8 @@ - + - + @@ -652,7 +652,7 @@ - + @@ -697,15 +697,21 @@ - + + + + diff --git a/Examples/SDWebImage TV Demo/Base.lproj/Main.storyboard b/Examples/SDWebImage TV Demo/Base.lproj/Main.storyboard index 5f902948..5b9d768d 100644 --- a/Examples/SDWebImage TV Demo/Base.lproj/Main.storyboard +++ b/Examples/SDWebImage TV Demo/Base.lproj/Main.storyboard @@ -1,11 +1,11 @@ - + - + diff --git a/Examples/SDWebImage Watch Demo/Base.lproj/Interface.storyboard b/Examples/SDWebImage Watch Demo/Base.lproj/Interface.storyboard index d2788c7e..133cad27 100644 --- a/Examples/SDWebImage Watch Demo/Base.lproj/Interface.storyboard +++ b/Examples/SDWebImage Watch Demo/Base.lproj/Interface.storyboard @@ -1,8 +1,12 @@ - - + + + + + - - + + + From 5c22cc73aea6962fccc00c767b0621c458ac5ba0 Mon Sep 17 00:00:00 2001 From: DreamPiggy Date: Tue, 2 Jul 2019 18:22:52 +0800 Subject: [PATCH 3/3] Update the project warning for unnecessary xcconfig files --- .../xcschemes/SDWebImage OSX Demo.xcscheme | 2 +- .../xcschemes/SDWebImage TV Demo.xcscheme | 2 +- .../xcschemes/SDWebImage Watch Demo.xcscheme | 2 +- .../xcschemes/SDWebImage iOS Demo.xcscheme | 2 +- .../xcschemes/SDWebImage static.xcscheme | 2 +- .../xcshareddata/xcschemes/SDWebImage.xcscheme | 2 +- .../xcschemes/SDWebImageMapKit.xcscheme | 2 +- Tests/SDWebImage Tests.xcodeproj/project.pbxproj | 14 +------------- .../xcshareddata/xcschemes/Tests Mac.xcscheme | 2 +- .../xcshareddata/xcschemes/Tests.xcscheme | 2 +- 10 files changed, 10 insertions(+), 22 deletions(-) diff --git a/Examples/SDWebImage Demo.xcodeproj/xcshareddata/xcschemes/SDWebImage OSX Demo.xcscheme b/Examples/SDWebImage Demo.xcodeproj/xcshareddata/xcschemes/SDWebImage OSX Demo.xcscheme index b21a9fa3..4aba9bfb 100644 --- a/Examples/SDWebImage Demo.xcodeproj/xcshareddata/xcschemes/SDWebImage OSX Demo.xcscheme +++ b/Examples/SDWebImage Demo.xcodeproj/xcshareddata/xcschemes/SDWebImage OSX Demo.xcscheme @@ -1,6 +1,6 @@