From 3f7e3e6aebf24daa052c9552ab96489c1fa4a547 Mon Sep 17 00:00:00 2001 From: Alexander Eggers <7427545+AlexanderEggers@users.noreply.github.com> Date: Thu, 19 May 2022 16:47:23 +1000 Subject: [PATCH] fix different ios related issues --- example/ios/Podfile.lock | 2 +- example/ios/example.xcodeproj/project.pbxproj | 2 +- .../project.pbxproj | 16 ++++++++------ .../contents.xcworkspacedata | 7 +++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++++++ lottie-react-native.podspec | 21 +++++++------------ 6 files changed, 35 insertions(+), 21 deletions(-) create mode 100644 ios/LottieReactNative.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 ios/LottieReactNative.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index ca1bfcf1..4b31fc56 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -416,7 +416,7 @@ SPEC CHECKSUMS: fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 476ee3e89abb49e07f822b48323c51c57124b572 lottie-ios: c058aeafa76daa4cf64d773554bccc8385d0150e - lottie-react-native: a501112fa980529ccb80b9f3ee117a7f98c6af3a + lottie-react-native: 058cb713f9eab4bb06cde9d7efd9c6a43ad8ff4a RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8 RCTRequired: 3e917ea5377751094f38145fdece525aa90545a0 RCTTypeSafety: c43c072a4bd60feb49a9570b0517892b4305c45e diff --git a/example/ios/example.xcodeproj/project.pbxproj b/example/ios/example.xcodeproj/project.pbxproj index 97301459..cd131ad4 100644 --- a/example/ios/example.xcodeproj/project.pbxproj +++ b/example/ios/example.xcodeproj/project.pbxproj @@ -260,7 +260,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "set -e\n\nexport NODE_BINARY=node\n../../node_modules/react-native/scripts/react-native-xcode.sh\n"; + shellScript = "set -e\n\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n"; }; 8DD43941E1EBBE317138198A /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; diff --git a/ios/LottieReactNative.xcodeproj/project.pbxproj b/ios/LottieReactNative.xcodeproj/project.pbxproj index 833a0f1e..9e4ef39c 100644 --- a/ios/LottieReactNative.xcodeproj/project.pbxproj +++ b/ios/LottieReactNative.xcodeproj/project.pbxproj @@ -10,11 +10,11 @@ 6E31134322B3A73000690A5B /* AnimationViewManagerModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E31134022B3A73000690A5B /* AnimationViewManagerModule.swift */; platformFilter = ios; }; 6E31134422B3A73000690A5B /* ContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E31134122B3A73000690A5B /* ContainerView.swift */; platformFilter = ios; }; 6E31134522B3A73000690A5B /* LRNAnimationViewManagerObjC.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E31134222B3A73000690A5B /* LRNAnimationViewManagerObjC.m */; platformFilter = ios; }; - 74E4DD2224F9656D00F271AF /* hexStringToColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E4DD2124F9656D00F271AF /* hexStringToColor.swift */; platformFilter = ios; }; 74E4DD2324F9677E00F271AF /* AnimationViewManagerModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E31134022B3A73000690A5B /* AnimationViewManagerModule.swift */; }; 74E4DD2424F9678000F271AF /* ContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E31134122B3A73000690A5B /* ContainerView.swift */; }; 74E4DD2524F9678100F271AF /* LRNAnimationViewManagerObjC.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E31134222B3A73000690A5B /* LRNAnimationViewManagerObjC.m */; }; - 74E4DD2724F9678700F271AF /* hexStringToColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E4DD2124F9656D00F271AF /* hexStringToColor.swift */; }; + FA8409AE28361B7C00F398C7 /* RCTConvert+Lottie.m in Sources */ = {isa = PBXBuildFile; fileRef = FA8409AB28361B7C00F398C7 /* RCTConvert+Lottie.m */; }; + FA8409AF28361B7C00F398C7 /* PlatformColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA8409AD28361B7C00F398C7 /* PlatformColor.swift */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -35,8 +35,10 @@ 6E31134022B3A73000690A5B /* AnimationViewManagerModule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimationViewManagerModule.swift; sourceTree = ""; }; 6E31134122B3A73000690A5B /* ContainerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContainerView.swift; sourceTree = ""; }; 6E31134222B3A73000690A5B /* LRNAnimationViewManagerObjC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LRNAnimationViewManagerObjC.m; sourceTree = ""; }; - 74E4DD2124F9656D00F271AF /* hexStringToColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = hexStringToColor.swift; sourceTree = ""; }; 85ABD46724D07DFD0099C9BD /* libLottieReactNativeMacOS.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libLottieReactNativeMacOS.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + FA8409AB28361B7C00F398C7 /* RCTConvert+Lottie.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+Lottie.m"; sourceTree = ""; }; + FA8409AC28361B7C00F398C7 /* RCTConvert+Lottie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+Lottie.h"; sourceTree = ""; }; + FA8409AD28361B7C00F398C7 /* PlatformColor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlatformColor.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -78,11 +80,13 @@ 11FA5C531C4A1296003AC2EE /* LottieReactNative */ = { isa = PBXGroup; children = ( + FA8409AD28361B7C00F398C7 /* PlatformColor.swift */, + FA8409AC28361B7C00F398C7 /* RCTConvert+Lottie.h */, + FA8409AB28361B7C00F398C7 /* RCTConvert+Lottie.m */, 6E31134022B3A73000690A5B /* AnimationViewManagerModule.swift */, 6E31134122B3A73000690A5B /* ContainerView.swift */, 6E31134222B3A73000690A5B /* LRNAnimationViewManagerObjC.m */, 6E31133F22B3A72F00690A5B /* Bridging.h */, - 74E4DD2124F9656D00F271AF /* hexStringToColor.swift */, ); path = LottieReactNative; sourceTree = ""; @@ -185,10 +189,11 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + FA8409AE28361B7C00F398C7 /* RCTConvert+Lottie.m in Sources */, + FA8409AF28361B7C00F398C7 /* PlatformColor.swift in Sources */, 6E31134422B3A73000690A5B /* ContainerView.swift in Sources */, 6E31134522B3A73000690A5B /* LRNAnimationViewManagerObjC.m in Sources */, 6E31134322B3A73000690A5B /* AnimationViewManagerModule.swift in Sources */, - 74E4DD2224F9656D00F271AF /* hexStringToColor.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -199,7 +204,6 @@ 74E4DD2324F9677E00F271AF /* AnimationViewManagerModule.swift in Sources */, 74E4DD2424F9678000F271AF /* ContainerView.swift in Sources */, 74E4DD2524F9678100F271AF /* LRNAnimationViewManagerObjC.m in Sources */, - 74E4DD2724F9678700F271AF /* hexStringToColor.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/LottieReactNative.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/LottieReactNative.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..919434a6 --- /dev/null +++ b/ios/LottieReactNative.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/ios/LottieReactNative.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/LottieReactNative.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/ios/LottieReactNative.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/lottie-react-native.podspec b/lottie-react-native.podspec index d2c5424e..bb460fbe 100644 --- a/lottie-react-native.podspec +++ b/lottie-react-native.podspec @@ -1,26 +1,21 @@ require 'json' -package = JSON.parse(File.read(File.join(__dir__, 'package.json'))) +package = JSON.parse(File.read(File.join(__dir__, "package.json"))) Pod::Spec.new do |s| - s.name = "lottie-react-native" + s.name = package["name"] s.version = package['version'] - s.summary = "Lottie component for React Native (iOS and Android)" - - s.authors = { "intelligibabble" => "leland.m.richardson@gmail.com" } - s.homepage = "https://github.com/airbnb/lottie-react-native#readme" - s.license = package['license'] + s.summary = package["description"] + s.homepage = package["homepage"] + s.license = { :type => "Apache-2.0", :file => "LICENSE" } + s.author = { "author" => "leland.m.richardson@gmail.com" } s.ios.deployment_target = '11.0' s.osx.deployment_target = '10.10' s.tvos.deployment_target = '11.0' - s.source = { :git => "https://github.com/react-community/lottie-react-native.git", :tag => "v#{s.version}" } - s.source_files = "src/ios/**/*.{h,m,swift}" - - s.requires_arc = true - - s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } + s.source_files = "ios/**/*.{h,m,swift}" s.swift_version = "5.0" + s.dependency 'React-Core' s.dependency 'lottie-ios', '~> 3.4.0' end