diff --git a/Cartfile b/Cartfile index 01372c8..fddb077 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1,2 @@ -github "SDWebImage/SDWebImage" >= 5.0.0-beta4 \ No newline at end of file +github "SDWebImage/SDWebImage" >= 5.0.0-beta4 +github "SDWebImage/libbpg-Xcode" ~>0.9.8 \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index b93d4eb..14d30b8 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1,2 @@ github "SDWebImage/SDWebImage" "5.0.0-beta4" +github "SDWebImage/libbpg-Xcode" "0.9.8" diff --git a/Example/Podfile.lock b/Example/Podfile.lock index c18b9d0..a2468da 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,7 +1,7 @@ PODS: - Expecta (1.0.6) - SDWebImage/Core (5.0.0-beta4) - - SDWebImageBPGCoder (0.2.1): + - SDWebImageBPGCoder (0.2.2): - SDWebImage/Core (>= 5.0.0-beta4) - Specta (1.0.7) @@ -23,7 +23,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5 SDWebImage: 56bfe1114b11f1d5766d6d0e3b3456cfd7e1e8b7 - SDWebImageBPGCoder: 60038a4c7df995ee39a9cc4d61e7050984f8750d + SDWebImageBPGCoder: b479ed252aa19b2a3c5a38e274e078c6f3607e20 Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66 PODFILE CHECKSUM: 2175744386f7a924ca415e90b59e6cf33d634c7f diff --git a/Example/SDWebImageBPGCoder.xcodeproj/project.pbxproj b/Example/SDWebImageBPGCoder.xcodeproj/project.pbxproj index c1d51ea..707181d 100644 --- a/Example/SDWebImageBPGCoder.xcodeproj/project.pbxproj +++ b/Example/SDWebImageBPGCoder.xcodeproj/project.pbxproj @@ -248,6 +248,9 @@ LastUpgradeCheck = 0940; ORGANIZATIONNAME = dreampiggy; TargetAttributes = { + 6003F589195388D20070C39A = { + DevelopmentTeam = H7W77QXGX2; + }; 6003F5AD195388D20070C39A = { TestTargetID = 6003F589195388D20070C39A; }; @@ -534,6 +537,7 @@ baseConfigurationReference = BEAE0F6B3B7BB49015E77988 /* Pods-SDWebImageBPGCoder_Example.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + DEVELOPMENT_TEAM = H7W77QXGX2; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "SDWebImageBPGCoder/SDWebImageBPGCoder-Prefix.pch"; INFOPLIST_FILE = "SDWebImageBPGCoder/SDWebImageBPGCoder-Info.plist"; @@ -549,6 +553,7 @@ baseConfigurationReference = 23CC995E938AB20B65A269A6 /* Pods-SDWebImageBPGCoder_Example.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + DEVELOPMENT_TEAM = H7W77QXGX2; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "SDWebImageBPGCoder/SDWebImageBPGCoder-Prefix.pch"; INFOPLIST_FILE = "SDWebImageBPGCoder/SDWebImageBPGCoder-Info.plist"; diff --git a/Example/SDWebImageBPGCoder/SDViewController.m b/Example/SDWebImageBPGCoder/SDViewController.m index 82f59af..b94f208 100644 --- a/Example/SDWebImageBPGCoder/SDViewController.m +++ b/Example/SDWebImageBPGCoder/SDViewController.m @@ -22,7 +22,7 @@ - (void)viewDidLoad SDImageBPGCoder *BPGCoder = [SDImageBPGCoder sharedCoder]; [[SDImageCodersManager sharedManager] addCoder:BPGCoder]; - NSURL *staticBPGURL = [NSURL URLWithString:@"https://uc8755e25430dc6bccf40320efe8.dl.dropboxusercontent.com/cd/0/get/AMJ3W0LvDVmwTkd48zje8bfP3tXPcT-P-y5Ni7CAuVJD3pcnEJLR-RLhasMY-Rk-bmGYB94nkQQN_HbTTpsRkSb6PcAV1eI-ZwkaEwgnunrAI6OpMTPGi-7lNOPtPaoQDlBI-6PPmpuC8W9x0uBz8qqTp-vk8-jTKp1FIXthk11CkhWefxdOn3z6QhZ_wafO0es/file?dl=1"]; + NSURL *staticBPGURL = [NSURL URLWithString:@"https://bellard.org/bpg/003.bpg"]; NSURL *animatedBPGURL = [NSURL URLWithString:@"https://bellard.org/bpg/cinemagraph-6.bpg"]; CGSize screenSize = [UIScreen mainScreen].bounds.size; diff --git a/README.md b/README.md index 83e5630..bac4fbb 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ pod 'SDWebImageBPGCoder' #### Carthage -SDWebImageBPGCoder is available through [Carthage](https://github.com/Carthage/Carthage). +SDWebImageBPGCoder is available through [Carthage](https://github.com/Carthage/Carthage). Which use libbpg as dynamic framework. ``` github "SDWebImage/SDWebImageBPGCoder" diff --git a/SDWebImageBPGCoder.podspec b/SDWebImageBPGCoder.podspec index c8db431..4b51318 100644 --- a/SDWebImageBPGCoder.podspec +++ b/SDWebImageBPGCoder.podspec @@ -28,11 +28,15 @@ TODO: Add long description of the pod here. s.ios.deployment_target = '8.0' s.osx.deployment_target = '10.10' + s.tvos.deployment_target = '9.0' + s.watchos.deployment_target = '2.0' s.source_files = 'SDWebImageBPGCoder/Classes/**/*', 'Vendor/libbpg/include/libbpg.h', 'SDWebImageBPGCoder/Module/SDWebImageBPGCoder.h' s.module_map = 'SDWebImageBPGCoder/Module/SDWebImageBPGCoder.modulemap' s.public_header_files = 'SDWebImageBPGCoder/Classes/**/*.h', 'SDWebImageBPGCoder/Module/SDWebImageBPGCoder.h' s.osx.vendored_libraries = 'Vendor/libbpg/lib/mac/libbpg.a' s.ios.vendored_libraries = 'Vendor/libbpg/lib/ios/libbpg.a' + s.tvos.vendored_libraries = 'Vendor/libbpg/lib/tvos/libbpg.a' + s.watchos.vendored_libraries = 'Vendor/libbpg/lib/watchos/libbpg.a' s.dependency 'SDWebImage/Core', '>= 5.0.0-beta4' end diff --git a/SDWebImageBPGCoder.xcodeproj/project.pbxproj b/SDWebImageBPGCoder.xcodeproj/project.pbxproj index 316947f..2b1e22d 100644 --- a/SDWebImageBPGCoder.xcodeproj/project.pbxproj +++ b/SDWebImageBPGCoder.xcodeproj/project.pbxproj @@ -7,21 +7,37 @@ objects = { /* Begin PBXBuildFile section */ + 329CC13722006F5D001FB68F /* libbpg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 329CC13622006F5D001FB68F /* libbpg.framework */; }; + 329CC13922006F6B001FB68F /* libbpg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 329CC13822006F6B001FB68F /* libbpg.framework */; }; + 329CC15422006FBA001FB68F /* SDImageBPGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 329CE7AE21FC96B400A5875B /* SDImageBPGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 329CC15522006FBA001FB68F /* SDImageBPGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 329CE7AC21FC96B400A5875B /* SDImageBPGCoder.m */; }; + 329CC15622006FBB001FB68F /* SDImageBPGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 329CE7AE21FC96B400A5875B /* SDImageBPGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 329CC15722006FBB001FB68F /* SDImageBPGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 329CE7AC21FC96B400A5875B /* SDImageBPGCoder.m */; }; + 329CC15822006FBD001FB68F /* SDWebImageBPGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 329CE7B221FC96C800A5875B /* SDWebImageBPGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 329CC15922006FBE001FB68F /* SDWebImageBPGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 329CE7B221FC96C800A5875B /* SDWebImageBPGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 329CC15B220084DD001FB68F /* SDWebImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 329CC15A220084DD001FB68F /* SDWebImage.framework */; }; + 329CC15D220084E8001FB68F /* libbpg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 329CC15C220084E8001FB68F /* libbpg.framework */; }; + 329CC15F220084F4001FB68F /* SDWebImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 329CC15E220084F4001FB68F /* SDWebImage.framework */; }; + 329CC161220084FE001FB68F /* libbpg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 329CC160220084FE001FB68F /* libbpg.framework */; }; 329CE7AF21FC96B400A5875B /* SDImageBPGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 329CE7AC21FC96B400A5875B /* SDImageBPGCoder.m */; }; 329CE7B121FC96B400A5875B /* SDImageBPGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 329CE7AE21FC96B400A5875B /* SDImageBPGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; 329CE7B421FC96C800A5875B /* SDWebImageBPGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 329CE7B221FC96C800A5875B /* SDWebImageBPGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; 329CE7B821FC97C000A5875B /* SDWebImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 329CE7B721FC97C000A5875B /* SDWebImage.framework */; }; - 329CE7BE21FC987200A5875B /* libbpg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 329CE7BD21FC987200A5875B /* libbpg.a */; }; 329CE7CC21FC9B0900A5875B /* SDImageBPGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 329CE7AE21FC96B400A5875B /* SDImageBPGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; 329CE7CD21FC9B0D00A5875B /* SDImageBPGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 329CE7AC21FC96B400A5875B /* SDImageBPGCoder.m */; }; 329CE7CE21FC9B1100A5875B /* SDWebImageBPGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 329CE7B221FC96C800A5875B /* SDWebImageBPGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; 329CE7D021FC9B2700A5875B /* SDWebImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 329CE7CF21FC9B2700A5875B /* SDWebImage.framework */; }; - 329CE7D221FC9B3000A5875B /* libbpg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 329CE7D121FC9B3000A5875B /* libbpg.a */; }; - 32FB33F521FEC288006F34C9 /* libbpg.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FB33F421FEC288006F34C9 /* libbpg.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 32FB33F621FEC288006F34C9 /* libbpg.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FB33F421FEC288006F34C9 /* libbpg.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 329CC13622006F5D001FB68F /* libbpg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libbpg.framework; path = Carthage/Build/iOS/libbpg.framework; sourceTree = ""; }; + 329CC13822006F6B001FB68F /* libbpg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libbpg.framework; path = Carthage/Build/Mac/libbpg.framework; sourceTree = ""; }; + 329CC13F22006F96001FB68F /* SDWebImageBPGCoder.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDWebImageBPGCoder.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 329CC14C22006FA0001FB68F /* SDWebImageBPGCoder.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDWebImageBPGCoder.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 329CC15A220084DD001FB68F /* SDWebImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDWebImage.framework; path = Carthage/Build/tvOS/SDWebImage.framework; sourceTree = ""; }; + 329CC15C220084E8001FB68F /* libbpg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libbpg.framework; path = Carthage/Build/tvOS/libbpg.framework; sourceTree = ""; }; + 329CC15E220084F4001FB68F /* SDWebImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDWebImage.framework; path = Carthage/Build/watchOS/SDWebImage.framework; sourceTree = ""; }; + 329CC160220084FE001FB68F /* libbpg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libbpg.framework; path = Carthage/Build/watchOS/libbpg.framework; sourceTree = ""; }; 329CE79C21FC961400A5875B /* SDWebImageBPGCoder.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDWebImageBPGCoder.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 329CE7AC21FC96B400A5875B /* SDImageBPGCoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDImageBPGCoder.m; sourceTree = ""; }; 329CE7AE21FC96B400A5875B /* SDImageBPGCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDImageBPGCoder.h; sourceTree = ""; }; @@ -29,18 +45,35 @@ 329CE7B321FC96C800A5875B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Module/Info.plist; sourceTree = ""; }; 329CE7B721FC97C000A5875B /* SDWebImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDWebImage.framework; path = Carthage/Build/iOS/SDWebImage.framework; sourceTree = ""; }; 329CE7BD21FC987200A5875B /* libbpg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbpg.a; path = Vendor/libbpg/lib/ios/libbpg.a; sourceTree = ""; }; - 329CE7C421FC9AF200A5875B /* SDWebImageBPGCoder_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDWebImageBPGCoder_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 329CE7C421FC9AF200A5875B /* SDWebImageBPGCoder.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDWebImageBPGCoder.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 329CE7CF21FC9B2700A5875B /* SDWebImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDWebImage.framework; path = Carthage/Build/Mac/SDWebImage.framework; sourceTree = ""; }; 329CE7D121FC9B3000A5875B /* libbpg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbpg.a; path = Vendor/libbpg/lib/mac/libbpg.a; sourceTree = ""; }; - 32FB33F421FEC288006F34C9 /* libbpg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libbpg.h; path = Vendor/libbpg/include/libbpg.h; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 329CC13C22006F96001FB68F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 329CC15D220084E8001FB68F /* libbpg.framework in Frameworks */, + 329CC15B220084DD001FB68F /* SDWebImage.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 329CC14922006FA0001FB68F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 329CC161220084FE001FB68F /* libbpg.framework in Frameworks */, + 329CC15F220084F4001FB68F /* SDWebImage.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 329CE79921FC961400A5875B /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 329CE7BE21FC987200A5875B /* libbpg.a in Frameworks */, + 329CC13722006F5D001FB68F /* libbpg.framework in Frameworks */, 329CE7B821FC97C000A5875B /* SDWebImage.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -49,7 +82,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 329CE7D221FC9B3000A5875B /* libbpg.a in Frameworks */, + 329CC13922006F6B001FB68F /* libbpg.framework in Frameworks */, 329CE7D021FC9B2700A5875B /* SDWebImage.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -70,7 +103,9 @@ isa = PBXGroup; children = ( 329CE79C21FC961400A5875B /* SDWebImageBPGCoder.framework */, - 329CE7C421FC9AF200A5875B /* SDWebImageBPGCoder_macOS.framework */, + 329CE7C421FC9AF200A5875B /* SDWebImageBPGCoder.framework */, + 329CC13F22006F96001FB68F /* SDWebImageBPGCoder.framework */, + 329CC14C22006FA0001FB68F /* SDWebImageBPGCoder.framework */, ); name = Products; sourceTree = ""; @@ -81,7 +116,6 @@ 329CE7AB21FC96B400A5875B /* Classes */, 329CE7B321FC96C800A5875B /* Info.plist */, 329CE7B221FC96C800A5875B /* SDWebImageBPGCoder.h */, - 32FB33F421FEC288006F34C9 /* libbpg.h */, ); path = SDWebImageBPGCoder; sourceTree = ""; @@ -98,6 +132,12 @@ 329CE7B621FC97C000A5875B /* Frameworks */ = { isa = PBXGroup; children = ( + 329CC160220084FE001FB68F /* libbpg.framework */, + 329CC15E220084F4001FB68F /* SDWebImage.framework */, + 329CC15C220084E8001FB68F /* libbpg.framework */, + 329CC15A220084DD001FB68F /* SDWebImage.framework */, + 329CC13622006F5D001FB68F /* libbpg.framework */, + 329CC13822006F6B001FB68F /* libbpg.framework */, 329CE7D121FC9B3000A5875B /* libbpg.a */, 329CE7CF21FC9B2700A5875B /* SDWebImage.framework */, 329CE7BD21FC987200A5875B /* libbpg.a */, @@ -109,11 +149,28 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ + 329CC13A22006F96001FB68F /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 329CC15822006FBD001FB68F /* SDWebImageBPGCoder.h in Headers */, + 329CC15422006FBA001FB68F /* SDImageBPGCoder.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 329CC14722006FA0001FB68F /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 329CC15922006FBE001FB68F /* SDWebImageBPGCoder.h in Headers */, + 329CC15622006FBB001FB68F /* SDImageBPGCoder.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 329CE79721FC961400A5875B /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 32FB33F521FEC288006F34C9 /* libbpg.h in Headers */, 329CE7B421FC96C800A5875B /* SDWebImageBPGCoder.h in Headers */, 329CE7B121FC96B400A5875B /* SDImageBPGCoder.h in Headers */, ); @@ -123,7 +180,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 32FB33F621FEC288006F34C9 /* libbpg.h in Headers */, 329CE7CE21FC9B1100A5875B /* SDWebImageBPGCoder.h in Headers */, 329CE7CC21FC9B0900A5875B /* SDImageBPGCoder.h in Headers */, ); @@ -132,6 +188,42 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ + 329CC13E22006F96001FB68F /* SDWebImageBPGCoder-tvOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 329CC14422006F96001FB68F /* Build configuration list for PBXNativeTarget "SDWebImageBPGCoder-tvOS" */; + buildPhases = ( + 329CC13A22006F96001FB68F /* Headers */, + 329CC13B22006F96001FB68F /* Sources */, + 329CC13C22006F96001FB68F /* Frameworks */, + 329CC13D22006F96001FB68F /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "SDWebImageBPGCoder-tvOS"; + productName = "SDWebImageBPGCoder-tvOS"; + productReference = 329CC13F22006F96001FB68F /* SDWebImageBPGCoder.framework */; + productType = "com.apple.product-type.framework"; + }; + 329CC14B22006FA0001FB68F /* SDWebImageBPGCoder-watchOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 329CC15122006FA0001FB68F /* Build configuration list for PBXNativeTarget "SDWebImageBPGCoder-watchOS" */; + buildPhases = ( + 329CC14722006FA0001FB68F /* Headers */, + 329CC14822006FA0001FB68F /* Sources */, + 329CC14922006FA0001FB68F /* Frameworks */, + 329CC14A22006FA0001FB68F /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "SDWebImageBPGCoder-watchOS"; + productName = "SDWebImageBPGCoder-watchOS"; + productReference = 329CC14C22006FA0001FB68F /* SDWebImageBPGCoder.framework */; + productType = "com.apple.product-type.framework"; + }; 329CE79B21FC961400A5875B /* SDWebImageBPGCoder */ = { isa = PBXNativeTarget; buildConfigurationList = 329CE7A421FC961400A5875B /* Build configuration list for PBXNativeTarget "SDWebImageBPGCoder" */; @@ -165,7 +257,7 @@ ); name = "SDWebImageBPGCoder-macOS"; productName = "SDWebImageBPGCoder-macOS"; - productReference = 329CE7C421FC9AF200A5875B /* SDWebImageBPGCoder_macOS.framework */; + productReference = 329CE7C421FC9AF200A5875B /* SDWebImageBPGCoder.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -177,6 +269,12 @@ LastUpgradeCheck = 1010; ORGANIZATIONNAME = SDWebImage; TargetAttributes = { + 329CC13E22006F96001FB68F = { + CreatedOnToolsVersion = 10.1; + }; + 329CC14B22006FA0001FB68F = { + CreatedOnToolsVersion = 10.1; + }; 329CE79B21FC961400A5875B = { CreatedOnToolsVersion = 10.1; }; @@ -199,11 +297,27 @@ targets = ( 329CE79B21FC961400A5875B /* SDWebImageBPGCoder */, 329CE7C321FC9AF200A5875B /* SDWebImageBPGCoder-macOS */, + 329CC13E22006F96001FB68F /* SDWebImageBPGCoder-tvOS */, + 329CC14B22006FA0001FB68F /* SDWebImageBPGCoder-watchOS */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 329CC13D22006F96001FB68F /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 329CC14A22006FA0001FB68F /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 329CE79A21FC961400A5875B /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -221,6 +335,22 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 329CC13B22006F96001FB68F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 329CC15522006FBA001FB68F /* SDImageBPGCoder.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 329CC14822006FA0001FB68F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 329CC15722006FBB001FB68F /* SDImageBPGCoder.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 329CE79821FC961400A5875B /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -240,10 +370,133 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ + 329CC14522006F96001FB68F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Automatic; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/tvOS", + ); + INFOPLIST_FILE = "$(SRCROOT)/SDWebImageBPGCoder/Module/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "org.SDWebImage.SDWebImageBPGCoder-tvOS"; + PRODUCT_MODULE_NAME = SDWebImageBPGCoder; + PRODUCT_NAME = SDWebImageBPGCoder; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 9.0; + }; + name = Debug; + }; + 329CC14622006F96001FB68F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Automatic; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/tvOS", + ); + INFOPLIST_FILE = "$(SRCROOT)/SDWebImageBPGCoder/Module/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "org.SDWebImage.SDWebImageBPGCoder-tvOS"; + PRODUCT_MODULE_NAME = SDWebImageBPGCoder; + PRODUCT_NAME = SDWebImageBPGCoder; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 9.0; + }; + name = Release; + }; + 329CC15222006FA0001FB68F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Automatic; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/watchOS", + ); + INFOPLIST_FILE = "$(SRCROOT)/SDWebImageBPGCoder/Module/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "org.SDWebImage.SDWebImageBPGCoder-watchOS"; + PRODUCT_MODULE_NAME = SDWebImageBPGCoder; + PRODUCT_NAME = SDWebImageBPGCoder; + SDKROOT = watchos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 2.0; + }; + name = Debug; + }; + 329CC15322006FA0001FB68F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Automatic; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/watchOS", + ); + INFOPLIST_FILE = "$(SRCROOT)/SDWebImageBPGCoder/Module/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "org.SDWebImage.SDWebImageBPGCoder-watchOS"; + PRODUCT_MODULE_NAME = SDWebImageBPGCoder; + PRODUCT_NAME = SDWebImageBPGCoder; + SDKROOT = watchos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 2.0; + }; + name = Release; + }; 329CE7A221FC961400A5875B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -292,7 +545,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -306,6 +559,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -348,7 +602,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -379,11 +633,8 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Vendor/libbpg/lib/ios", - ); PRODUCT_BUNDLE_IDENTIFIER = org.SDWebImage.SDWebImageBPGCoder; + PRODUCT_MODULE_NAME = SDWebImageBPGCoder; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; @@ -411,11 +662,8 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Vendor/libbpg/lib/ios", - ); PRODUCT_BUNDLE_IDENTIFIER = org.SDWebImage.SDWebImageBPGCoder; + PRODUCT_MODULE_NAME = SDWebImageBPGCoder; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; @@ -444,13 +692,10 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Vendor/libbpg/lib/mac", - ); MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = "org.SDWebImage.SDWebImageBPGCoder-macOS"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PRODUCT_MODULE_NAME = SDWebImageBPGCoder; + PRODUCT_NAME = SDWebImageBPGCoder; SDKROOT = macosx; SKIP_INSTALL = YES; }; @@ -478,13 +723,10 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Vendor/libbpg/lib/mac", - ); MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = "org.SDWebImage.SDWebImageBPGCoder-macOS"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PRODUCT_MODULE_NAME = SDWebImageBPGCoder; + PRODUCT_NAME = SDWebImageBPGCoder; SDKROOT = macosx; SKIP_INSTALL = YES; }; @@ -493,6 +735,24 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 329CC14422006F96001FB68F /* Build configuration list for PBXNativeTarget "SDWebImageBPGCoder-tvOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 329CC14522006F96001FB68F /* Debug */, + 329CC14622006F96001FB68F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 329CC15122006FA0001FB68F /* Build configuration list for PBXNativeTarget "SDWebImageBPGCoder-watchOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 329CC15222006FA0001FB68F /* Debug */, + 329CC15322006FA0001FB68F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 329CE79621FC961400A5875B /* Build configuration list for PBXProject "SDWebImageBPGCoder" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/SDWebImageBPGCoder.xcodeproj/xcshareddata/xcschemes/SDWebImageBPGCoder-tvOS.xcscheme b/SDWebImageBPGCoder.xcodeproj/xcshareddata/xcschemes/SDWebImageBPGCoder-tvOS.xcscheme new file mode 100644 index 0000000..c5281f9 --- /dev/null +++ b/SDWebImageBPGCoder.xcodeproj/xcshareddata/xcschemes/SDWebImageBPGCoder-tvOS.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SDWebImageBPGCoder.xcodeproj/xcshareddata/xcschemes/SDWebImageBPGCoder-watchOS.xcscheme b/SDWebImageBPGCoder.xcodeproj/xcshareddata/xcschemes/SDWebImageBPGCoder-watchOS.xcscheme new file mode 100644 index 0000000..7841169 --- /dev/null +++ b/SDWebImageBPGCoder.xcodeproj/xcshareddata/xcschemes/SDWebImageBPGCoder-watchOS.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SDWebImageBPGCoder/Classes/SDImageBPGCoder.m b/SDWebImageBPGCoder/Classes/SDImageBPGCoder.m index c10814c..a2eed17 100644 --- a/SDWebImageBPGCoder/Classes/SDImageBPGCoder.m +++ b/SDWebImageBPGCoder/Classes/SDImageBPGCoder.m @@ -6,7 +6,11 @@ // #import "SDImageBPGCoder.h" +#if __has_include() +#import +#else #import "libbpg.h" +#endif #define SD_FOUR_CC(c1,c2,c3,c4) ((uint32_t)(((c4) << 24) | ((c3) << 16) | ((c2) << 8) | (c1))) diff --git a/Vendor/libbpg/VERSION b/Vendor/libbpg/VERSION index 85b7c69..e3e1807 100644 --- a/Vendor/libbpg/VERSION +++ b/Vendor/libbpg/VERSION @@ -1 +1 @@ -0.9.6 +0.9.8 diff --git a/Vendor/libbpg/include/libbpg.h b/Vendor/libbpg/include/libbpg.h index f02b02e..1df6bc8 100644 --- a/Vendor/libbpg/include/libbpg.h +++ b/Vendor/libbpg/include/libbpg.h @@ -24,6 +24,8 @@ #ifndef _LIBBPG_H #define _LIBBPG_H +#include + typedef struct BPGDecoderContext BPGDecoderContext; typedef enum { diff --git a/Vendor/libbpg/lib/ios/libbpg.a b/Vendor/libbpg/lib/ios/libbpg.a index 2cefe3f..1809267 100644 Binary files a/Vendor/libbpg/lib/ios/libbpg.a and b/Vendor/libbpg/lib/ios/libbpg.a differ diff --git a/Vendor/libbpg/lib/mac/libbpg.a b/Vendor/libbpg/lib/mac/libbpg.a index 1d53de7..afa07b3 100644 Binary files a/Vendor/libbpg/lib/mac/libbpg.a and b/Vendor/libbpg/lib/mac/libbpg.a differ diff --git a/Vendor/libbpg/lib/tvos/libbpg.a b/Vendor/libbpg/lib/tvos/libbpg.a new file mode 100644 index 0000000..f501095 Binary files /dev/null and b/Vendor/libbpg/lib/tvos/libbpg.a differ diff --git a/Vendor/libbpg/lib/watchos/libbpg.a b/Vendor/libbpg/lib/watchos/libbpg.a new file mode 100644 index 0000000..8030fba Binary files /dev/null and b/Vendor/libbpg/lib/watchos/libbpg.a differ