From 89d008830c2aebc1478c7443e90cd9e1940ee1e0 Mon Sep 17 00:00:00 2001 From: jordi domenech Date: Wed, 29 May 2019 14:44:36 +0200 Subject: [PATCH 1/3] added tvos target --- ios/FastImage.xcodeproj/project.pbxproj | 111 ++++++++++++++++++ .../xcschemes/FastImage-tvOS.xcscheme | 80 +++++++++++++ 2 files changed, 191 insertions(+) create mode 100644 ios/FastImage.xcodeproj/xcshareddata/xcschemes/FastImage-tvOS.xcscheme diff --git a/ios/FastImage.xcodeproj/project.pbxproj b/ios/FastImage.xcodeproj/project.pbxproj index b711c7a9d..ea282cc87 100644 --- a/ios/FastImage.xcodeproj/project.pbxproj +++ b/ios/FastImage.xcodeproj/project.pbxproj @@ -12,6 +12,11 @@ FCFB25401EA5562700F59778 /* FFFastImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = FCFB253A1EA5562700F59778 /* FFFastImageView.m */; }; FCFB25411EA5562700F59778 /* FFFastImageViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FCFB253C1EA5562700F59778 /* FFFastImageViewManager.m */; }; FCFB25421EA5562700F59778 /* RCTConvert+FFFastImage.m in Sources */ = {isa = PBXBuildFile; fileRef = FCFB253E1EA5562700F59778 /* RCTConvert+FFFastImage.m */; }; + FD751C43229EB44C002BE1F4 /* FFFastImageViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FCFB253C1EA5562700F59778 /* FFFastImageViewManager.m */; }; + FD751C44229EB44C002BE1F4 /* RCTConvert+FFFastImage.m in Sources */ = {isa = PBXBuildFile; fileRef = FCFB253E1EA5562700F59778 /* RCTConvert+FFFastImage.m */; }; + FD751C45229EB44C002BE1F4 /* FFFastImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = FCFB253A1EA5562700F59778 /* FFFastImageView.m */; }; + FD751C46229EB44C002BE1F4 /* FFFastImageSource.m in Sources */ = {isa = PBXBuildFile; fileRef = FCFB25381EA5562700F59778 /* FFFastImageSource.m */; }; + FD751C48229EB44C002BE1F4 /* libSDWebImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FCC6D0D01EB38D2F0065F944 /* libSDWebImage.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -43,6 +48,13 @@ remoteGlobalIDString = 53761307155AD0D5005750A4; remoteInfo = "SDWebImage iOS static"; }; + FD751C41229EB44C002BE1F4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = FCC6D0C61EB38D2F0065F944 /* SDWebImage.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 53761307155AD0D5005750A4; + remoteInfo = "SDWebImage iOS static"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -55,6 +67,15 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + FD751C49229EB44C002BE1F4 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = "include/$(PRODUCT_NAME)"; + dstSubfolderSpec = 16; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -68,6 +89,7 @@ FCFB253C1EA5562700F59778 /* FFFastImageViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FFFastImageViewManager.m; sourceTree = ""; }; FCFB253D1EA5562700F59778 /* RCTConvert+FFFastImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+FFFastImage.h"; sourceTree = ""; }; FCFB253E1EA5562700F59778 /* RCTConvert+FFFastImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+FFFastImage.m"; sourceTree = ""; }; + FD751C4D229EB44C002BE1F4 /* libFastImage-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libFastImage-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -79,6 +101,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + FD751C47229EB44C002BE1F4 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + FD751C48229EB44C002BE1F4 /* libSDWebImage.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -95,6 +125,7 @@ isa = PBXGroup; children = ( A287971D1DE0C0A60081BDFA /* libFastImage.a */, + FD751C4D229EB44C002BE1F4 /* libFastImage-tvOS.a */, ); name = Products; sourceTree = ""; @@ -153,6 +184,24 @@ productReference = A287971D1DE0C0A60081BDFA /* libFastImage.a */; productType = "com.apple.product-type.library.static"; }; + FD751C3F229EB44C002BE1F4 /* FastImage-tvOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = FD751C4A229EB44C002BE1F4 /* Build configuration list for PBXNativeTarget "FastImage-tvOS" */; + buildPhases = ( + FD751C42229EB44C002BE1F4 /* Sources */, + FD751C47229EB44C002BE1F4 /* Frameworks */, + FD751C49229EB44C002BE1F4 /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + FD751C40229EB44C002BE1F4 /* PBXTargetDependency */, + ); + name = "FastImage-tvOS"; + productName = FastImage; + productReference = FD751C4D229EB44C002BE1F4 /* libFastImage-tvOS.a */; + productType = "com.apple.product-type.library.static"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -188,6 +237,7 @@ projectRoot = ""; targets = ( A287971C1DE0C0A60081BDFA /* FastImage */, + FD751C3F229EB44C002BE1F4 /* FastImage-tvOS */, ); }; /* End PBXProject section */ @@ -228,6 +278,17 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + FD751C42229EB44C002BE1F4 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + FD751C43229EB44C002BE1F4 /* FFFastImageViewManager.m in Sources */, + FD751C44229EB44C002BE1F4 /* RCTConvert+FFFastImage.m in Sources */, + FD751C45229EB44C002BE1F4 /* FFFastImageView.m in Sources */, + FD751C46229EB44C002BE1F4 /* FFFastImageSource.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -236,6 +297,11 @@ name = "SDWebImage iOS static"; targetProxy = FCC6D1281EB3908E0065F944 /* PBXContainerItemProxy */; }; + FD751C40229EB44C002BE1F4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "SDWebImage iOS static"; + targetProxy = FD751C41229EB44C002BE1F4 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -355,6 +421,42 @@ }; name = Release; }; + FD751C4B229EB44C002BE1F4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../react-native/React/**", + "$(SRCROOT)/../../react-native/Libraries/Image", + "$(SRCROOT)/../../../ios/Pods/Headers/Public/**", + "$(SRCROOT)/Vendor/SDWebImage", + ); + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; + }; + name = Debug; + }; + FD751C4C229EB44C002BE1F4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../react-native/React/**", + "$(SRCROOT)/../../react-native/Libraries/Image", + "$(SRCROOT)/../../../ios/Pods/Headers/Public/**", + "$(SRCROOT)/Vendor/SDWebImage", + ); + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -376,6 +478,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + FD751C4A229EB44C002BE1F4 /* Build configuration list for PBXNativeTarget "FastImage-tvOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + FD751C4B229EB44C002BE1F4 /* Debug */, + FD751C4C229EB44C002BE1F4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = A28797151DE0C0A60081BDFA /* Project object */; diff --git a/ios/FastImage.xcodeproj/xcshareddata/xcschemes/FastImage-tvOS.xcscheme b/ios/FastImage.xcodeproj/xcshareddata/xcschemes/FastImage-tvOS.xcscheme new file mode 100644 index 000000000..0f1ffcc21 --- /dev/null +++ b/ios/FastImage.xcodeproj/xcshareddata/xcschemes/FastImage-tvOS.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a39c907f77c0862f3b27675fd45d04f59ae3ee6d Mon Sep 17 00:00:00 2001 From: jordi domenech Date: Fri, 21 Jun 2019 01:10:03 +0200 Subject: [PATCH 2/3] merge upstream/master --- ios/Vendor/SDWebImage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Vendor/SDWebImage b/ios/Vendor/SDWebImage index eae43de06..83997ca9e 160000 --- a/ios/Vendor/SDWebImage +++ b/ios/Vendor/SDWebImage @@ -1 +1 @@ -Subproject commit eae43de069a63cd9bb3980b423c4c15a9558aa7e +Subproject commit 83997ca9e4fd7d96ff2d7794e31e3a2fee6b5844 From f443ea06ebe96c66a84e573273740fedb38f5a9b Mon Sep 17 00:00:00 2001 From: jordi domenech Date: Fri, 21 Jun 2019 01:31:36 +0200 Subject: [PATCH 3/3] upgrade sdwebimage --- ios/Vendor/SDWebImage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Vendor/SDWebImage b/ios/Vendor/SDWebImage index 83997ca9e..2bbe973f5 160000 --- a/ios/Vendor/SDWebImage +++ b/ios/Vendor/SDWebImage @@ -1 +1 @@ -Subproject commit 83997ca9e4fd7d96ff2d7794e31e3a2fee6b5844 +Subproject commit 2bbe973f592ac3d4491e7c3a8055dfc8b1343efb