diff --git a/.travis.yml b/.travis.yml index 0d691a9..64eda78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ script: - mkdir DerivedData - echo Run the tests - - pod install --project-directory=SDWebImageWebPCoderTests + - pod install --project-directory=Tests - xcodebuild clean test -workspace SDWebImageWebPCoder.xcworkspace -scheme 'SDWebImageWebPCoderTests' -sdk iphonesimulator -destination 'name=iPhone 11 Pro' -configuration Debug -UseModernBuildSystem=NO | xcpretty -c - mv ~/Library/Developer/Xcode/DerivedData/ ./DerivedData/iOS diff --git a/README.md b/README.md index 3d2e3fd..4c90bf8 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ [![Platform](https://img.shields.io/cocoapods/p/SDWebImageWebPCoder.svg?style=flat)](http://cocoapods.org/pods/SDWebImageWebPCoder) [![SwiftPM compatible](https://img.shields.io/badge/SwiftPM-compatible-brightgreen.svg?style=flat)](https://swift.org/package-manager/) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/SDWebImage/SDWebImageWebPCoder) +[![codecov](https://codecov.io/gh/SDWebImage/SDWebImageWebPCoder/branch/master/graph/badge.svg)](https://codecov.io/gh/SDWebImage/SDWebImageWebPCoder) Starting with the SDWebImage 5.0 version, we moved the WebP support code and [libwebp](https://github.com/webmproject/libwebp) from the Core Repo to this stand-alone repo. diff --git a/SDWebImageWebPCoder.xcodeproj/project.pbxproj b/SDWebImageWebPCoder.xcodeproj/project.pbxproj index e6af427..171c0f6 100644 --- a/SDWebImageWebPCoder.xcodeproj/project.pbxproj +++ b/SDWebImageWebPCoder.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -43,7 +43,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 28D8AA3D3015E075692FD3E3 /* Pods-SDWebImageWebPCoderTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SDWebImageWebPCoderTests.debug.xcconfig"; path = "SDWebImageWebPCoderTests/Pods/Target Support Files/Pods-SDWebImageWebPCoderTests/Pods-SDWebImageWebPCoderTests.debug.xcconfig"; sourceTree = ""; }; + 28D8AA3D3015E075692FD3E3 /* Pods-SDWebImageWebPCoderTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SDWebImageWebPCoderTests.debug.xcconfig"; path = "Tests/Pods/Target Support Files/Pods-SDWebImageWebPCoderTests/Pods-SDWebImageWebPCoderTests.debug.xcconfig"; sourceTree = ""; }; 3217BE7B220547EB003D0310 /* SDWebImageWebPCoder.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = SDWebImageWebPCoder.modulemap; sourceTree = ""; }; 3219F3B1228B0453003822A6 /* TestImageBlendAnimated.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = TestImageBlendAnimated.webp; sourceTree = ""; }; 46F21AD7D1692EBAC4D0FF33 /* Pods_SDWebImageWebPCoderTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SDWebImageWebPCoderTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -70,7 +70,7 @@ 80BFF26E2136BE7900B95470 /* SDWebImageWebPCoder.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDWebImageWebPCoder.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 80BFF2772136BEE000B95470 /* SDWebImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDWebImage.framework; path = Carthage/Build/watchOS/SDWebImage.framework; sourceTree = ""; }; 80BFF2782136BEE000B95470 /* libwebp.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libwebp.framework; path = Carthage/Build/watchOS/libwebp.framework; sourceTree = ""; }; - D92E6791BF088D1A101E670E /* Pods-SDWebImageWebPCoderTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SDWebImageWebPCoderTests.release.xcconfig"; path = "SDWebImageWebPCoderTests/Pods/Target Support Files/Pods-SDWebImageWebPCoderTests/Pods-SDWebImageWebPCoderTests.release.xcconfig"; sourceTree = ""; }; + D92E6791BF088D1A101E670E /* Pods-SDWebImageWebPCoderTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SDWebImageWebPCoderTests.release.xcconfig"; path = "Tests/Pods/Target Support Files/Pods-SDWebImageWebPCoderTests/Pods-SDWebImageWebPCoderTests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -134,7 +134,7 @@ isa = PBXGroup; children = ( 806E77A82136A2E900A316D2 /* SDImageWebPCoder */, - 808C918C213FD131004B0F7C /* SDWebImageWebPCoderTests */, + 808C918C213FD131004B0F7C /* Tests */, 806E779E2136A1C000A316D2 /* Products */, 80BFF2312136AA7D00B95470 /* Frameworks */, 52FB3B532EE8775B69517E2E /* Pods */, @@ -192,14 +192,14 @@ path = Assets; sourceTree = ""; }; - 808C918C213FD131004B0F7C /* SDWebImageWebPCoderTests */ = { + 808C918C213FD131004B0F7C /* Tests */ = { isa = PBXGroup; children = ( 808C9199213FD2B2004B0F7C /* Images */, 808C918D213FD131004B0F7C /* SDWebImageWebPCoderTests.m */, 808C918F213FD131004B0F7C /* Info.plist */, ); - path = SDWebImageWebPCoderTests; + path = Tests; sourceTree = ""; }; 808C9199213FD2B2004B0F7C /* Images */ = { @@ -619,8 +619,14 @@ "DEBUG=1", "$(inherited)", ); - "GCC_PREPROCESSOR_DEFINITIONS[sdk=watchos*]" = "WEBP_USE_INTRINSICS=1 $(inherited)"; - "GCC_PREPROCESSOR_DEFINITIONS[sdk=watchsimulator*]" = "WEBP_USE_INTRINSICS=1 $(inherited)"; + "GCC_PREPROCESSOR_DEFINITIONS[sdk=watchos*]" = ( + "WEBP_USE_INTRINSICS=1", + "$(inherited)", + ); + "GCC_PREPROCESSOR_DEFINITIONS[sdk=watchsimulator*]" = ( + "WEBP_USE_INTRINSICS=1", + "$(inherited)", + ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -688,8 +694,14 @@ GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - "GCC_PREPROCESSOR_DEFINITIONS[sdk=watchos*]" = "WEBP_USE_INTRINSICS=1 $(inherited)"; - "GCC_PREPROCESSOR_DEFINITIONS[sdk=watchsimulator*]" = "WEBP_USE_INTRINSICS=1 $(inherited)"; + "GCC_PREPROCESSOR_DEFINITIONS[sdk=watchos*]" = ( + "WEBP_USE_INTRINSICS=1", + "$(inherited)", + ); + "GCC_PREPROCESSOR_DEFINITIONS[sdk=watchsimulator*]" = ( + "WEBP_USE_INTRINSICS=1", + "$(inherited)", + ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -766,7 +778,7 @@ "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = SDWebImageWebPCoderTests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = org.SDWebImage.SDWebImageWebPCoderTests; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -776,7 +788,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = D92E6791BF088D1A101E670E /* Pods-SDWebImageWebPCoderTests.release.xcconfig */; buildSettings = { - INFOPLIST_FILE = SDWebImageWebPCoderTests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; PRODUCT_BUNDLE_IDENTIFIER = org.SDWebImage.SDWebImageWebPCoderTests; PRODUCT_NAME = "$(TARGET_NAME)"; }; diff --git a/SDWebImageWebPCoder.xcworkspace/contents.xcworkspacedata b/SDWebImageWebPCoder.xcworkspace/contents.xcworkspacedata index 5a37b76..623a358 100644 --- a/SDWebImageWebPCoder.xcworkspace/contents.xcworkspacedata +++ b/SDWebImageWebPCoder.xcworkspace/contents.xcworkspacedata @@ -11,6 +11,6 @@ location = "group:Example/Pods/Pods.xcodeproj"> + location = "group:Tests/Pods/Pods.xcodeproj"> diff --git a/SDWebImageWebPCoderTests/Images/TestImageAnimated.webp b/Tests/Images/TestImageAnimated.webp similarity index 100% rename from SDWebImageWebPCoderTests/Images/TestImageAnimated.webp rename to Tests/Images/TestImageAnimated.webp diff --git a/SDWebImageWebPCoderTests/Images/TestImageBlendAnimated.webp b/Tests/Images/TestImageBlendAnimated.webp similarity index 100% rename from SDWebImageWebPCoderTests/Images/TestImageBlendAnimated.webp rename to Tests/Images/TestImageBlendAnimated.webp diff --git a/SDWebImageWebPCoderTests/Images/TestImageStatic.webp b/Tests/Images/TestImageStatic.webp similarity index 100% rename from SDWebImageWebPCoderTests/Images/TestImageStatic.webp rename to Tests/Images/TestImageStatic.webp diff --git a/SDWebImageWebPCoderTests/Info.plist b/Tests/Info.plist similarity index 100% rename from SDWebImageWebPCoderTests/Info.plist rename to Tests/Info.plist diff --git a/SDWebImageWebPCoderTests/Podfile b/Tests/Podfile similarity index 100% rename from SDWebImageWebPCoderTests/Podfile rename to Tests/Podfile diff --git a/SDWebImageWebPCoderTests/SDWebImageWebPCoderTests.m b/Tests/SDWebImageWebPCoderTests.m similarity index 100% rename from SDWebImageWebPCoderTests/SDWebImageWebPCoderTests.m rename to Tests/SDWebImageWebPCoderTests.m diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 0000000..406a6ba --- /dev/null +++ b/codecov.yml @@ -0,0 +1,9 @@ +coverage: + ignore: + - "Example" + - "SDWebImageWebPCoderTests" + status: + project: + default: off + ios: + flags: ios