From 1daf4d74ee0a23f21bbac9389d61ed61f2a60233 Mon Sep 17 00:00:00 2001 From: Prianka Liz Kariat Date: Sat, 6 May 2023 04:35:51 +0530 Subject: [PATCH] Updated common dependencies to link in helpers --- mediapipe/tasks/ios/BUILD | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mediapipe/tasks/ios/BUILD b/mediapipe/tasks/ios/BUILD index 5f1d9d6e4..84cfeaa47 100644 --- a/mediapipe/tasks/ios/BUILD +++ b/mediapipe/tasks/ios/BUILD @@ -33,14 +33,18 @@ licenses(["notice"]) # will be built with ":MediaPipeTasksCommon_framework" # 2. Task graphs. These will be built with ":MediaPipeTaskGraphs_library". # 3. gpu targets which will be built with the ":MediaPipeTaskGraphs_library". +# +# Instead of linking options and containers, we link their helpers to +# `MPPTasksCommon` to avoid duplicated method warnings in categories when text +# and vision frameworks are installed in the same Xcode project. OBJC_COMMON_DEPS = [ - "//mediapipe/tasks/ios/core:MPPBaseOptions", + "//mediapipe/tasks/ios/core/utils:MPPBaseOptionsHelpers", "//mediapipe/tasks/ios/core:MPPTaskInfo", "//mediapipe/tasks/ios/core:MPPTaskOptions", "//mediapipe/tasks/ios/core:MPPTaskResult", "//mediapipe/tasks/ios/core:MPPTaskRunner", - "//mediapipe/tasks/ios/components/containers:MPPClassificationResult", - "//mediapipe/tasks/ios/components/containers:MPPCategory", + "//mediapipe/tasks/ios/components/containers/utils:MPPClassificationResultHelpers", + "//mediapipe/tasks/ios/components/containers/utils:MPPCategoryHelpers", "//mediapipe/tasks/ios/common/utils:MPPCommonUtils", "//mediapipe/tasks/cc/vision/image_classifier:image_classifier_graph", "//mediapipe/tasks/cc/vision/object_detector:object_detector_graph", @@ -207,9 +211,9 @@ apple_static_xcframework( }, deps = [ "//mediapipe/tasks/ios/common/utils:MPPCommonUtils", - "//mediapipe/tasks/ios/components/containers:MPPCategory", - "//mediapipe/tasks/ios/components/containers:MPPClassificationResult", - "//mediapipe/tasks/ios/core:MPPBaseOptions", + "//mediapipe/tasks/ios/components/containers/utils:MPPCategoryHelpers", + "//mediapipe/tasks/ios/components/containers/utils:MPPClassificationResultHelpers", + "//mediapipe/tasks/ios/core/utils:MPPBaseOptionsHelpers", "//mediapipe/tasks/ios/core:MPPTaskInfo", "//mediapipe/tasks/ios/core:MPPTaskOptions", "//mediapipe/tasks/ios/core:MPPTaskResult",