Skip to content

Commit 933a3f2

Browse files
AdamEssenmacherAdamEssenmacher
committed
Commenting out MLKit deps not needed for BarcodeScanning
1 parent d742ef5 commit 933a3f2

File tree

3 files changed

+54
-54
lines changed

3 files changed

+54
-54
lines changed

‎components.cake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,11 @@ void SetArtifactsPodSpecs ()
240240
PodSpec.Create ("MLKitCommon", "11.0.0"),
241241
PodSpec.Create ("MLKitVision", "7.0.0"),
242242
PodSpec.Create ("MLImage", "1.0.0-beta5"),
243-
PodSpec.Create ("MLKitImageLabelingCommon", "7.0.0"),
244-
PodSpec.Create ("MLKitObjectDetectionCommon", "7.0.0"),
243+
//PodSpec.Create ("MLKitImageLabelingCommon", "7.0.0"),
244+
//PodSpec.Create ("MLKitObjectDetectionCommon", "7.0.0"),
245245
PodSpec.Create ("GoogleToolboxForMac", "4.2.1", frameworkSource: FrameworkSource.Pods, subSpecs: new [] { "Core", "Defines", "Logger", "NSData+zlib"}),
246246
PodSpec.Create ("GoogleUtilitiesComponents", "1.1.0", frameworkSource: FrameworkSource.Pods),
247-
PodSpec.Create ("SSZipArchive", "2.4.2", frameworkSource: FrameworkSource.Pods),
247+
//PodSpec.Create ("SSZipArchive", "2.4.2", frameworkSource: FrameworkSource.Pods),
248248
};
249249
MLKIT_TEXT_RECOGNITION.PodSpecs = new [] {
250250
PodSpec.Create ("MLKitTextRecognitionCommon", "1.0.0")

‎source/MLKit/Core/Core.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
<_NativeReference Include="..\..\..\externals\GoogleUtilitiesComponents.xcframework">
5656
<_Id>$(_GoogleUtilitiesComponentsId)</_Id>
5757
</_NativeReference>
58-
<_NativeReference Include="..\..\..\externals\SSZipArchive.xcframework">
59-
<_Id>$(_SSZipArchiveId)</_Id>
60-
</_NativeReference>
58+
<!-- <_NativeReference Include="..\..\..\externals\SSZipArchive.xcframework">-->
59+
<!-- <_Id>$(_SSZipArchiveId)</_Id>-->
60+
<!-- </_NativeReference>-->
6161
</ItemGroup>
6262
<!-- End of workaround -->
6363
<ItemGroup Condition="'$(TargetFramework)' == 'xamarin.ios10'">

‎source/MLKit/Core/Core.targets‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<_MLKitVisionSDKBaseFolder>$(XamarinBuildDownloadDir)$(_MLKitVisionItemsFolder)\Frameworks\</_MLKitVisionSDKBaseFolder>
88
<_MLImageItemsFolder>MLImage-1.0.0-beta5</_MLImageItemsFolder>
99
<_MLImageSDKBaseFolder>$(XamarinBuildDownloadDir)$(_MLImageItemsFolder)\Frameworks\</_MLImageSDKBaseFolder>
10-
<_MLKitImgLblCommonItemsFolder>MLKImgLblCommon-7.0.0</_MLKitImgLblCommonItemsFolder>
11-
<_MLKitImgLblCommonSDKBaseFolder>$(XamarinBuildDownloadDir)$(_MLKitImgLblCommonItemsFolder)\Frameworks\</_MLKitImgLblCommonSDKBaseFolder>
12-
<_MLKitObjCommonItemsFolder>MLKObjCommon-7.0.0</_MLKitObjCommonItemsFolder>
13-
<_MLKitObjCommonSDKBaseFolder>$(XamarinBuildDownloadDir)$(_MLKitObjCommonItemsFolder)\Frameworks\</_MLKitObjCommonSDKBaseFolder>
14-
<_MLKitObjCommonResourcesFolder>$(XamarinBuildDownloadDir)$(_MLKitObjCommonItemsFolder)\Resources\MLKitObjectDetectionCommonResources\</_MLKitObjCommonResourcesFolder>
10+
<!-- <_MLKitImgLblCommonItemsFolder>MLKImgLblCommon-7.0.0</_MLKitImgLblCommonItemsFolder>-->
11+
<!-- <_MLKitImgLblCommonSDKBaseFolder>$(XamarinBuildDownloadDir)$(_MLKitImgLblCommonItemsFolder)\Frameworks\</_MLKitImgLblCommonSDKBaseFolder>-->
12+
<!-- <_MLKitObjCommonItemsFolder>MLKObjCommon-7.0.0</_MLKitObjCommonItemsFolder>-->
13+
<!-- <_MLKitObjCommonSDKBaseFolder>$(XamarinBuildDownloadDir)$(_MLKitObjCommonItemsFolder)\Frameworks\</_MLKitObjCommonSDKBaseFolder>-->
14+
<!-- <_MLKitObjCommonResourcesFolder>$(XamarinBuildDownloadDir)$(_MLKitObjCommonItemsFolder)\Resources\MLKitObjectDetectionCommonResources\</_MLKitObjCommonResourcesFolder>-->
1515
</PropertyGroup>
1616
<ItemGroup Condition="('$(OutputType)'!='Library' OR '$(IsAppExtension)'=='True')">
1717
<XamarinBuildDownload Include="$(_MLKitCommonItemsFolder)">
@@ -26,14 +26,14 @@
2626
<Url>https://dl.google.com/dl/cpdc/10ddbf30d0514f6d/MLImage-1.0.0-beta5.tar.gz</Url>
2727
<Kind>Tgz</Kind>
2828
</XamarinBuildDownload>
29-
<XamarinBuildDownload Include="$(_MLKitImgLblCommonItemsFolder)">
30-
<Url>https://dl.google.com/dl/cpdc/32805ca33739d2ef/MLKitImageLabelingCommon-7.0.0.tar.gz</Url>
31-
<Kind>Tgz</Kind>
32-
</XamarinBuildDownload>
33-
<XamarinBuildDownload Include="$(_MLKitObjCommonItemsFolder)">
34-
<Url>https://dl.google.com/dl/cpdc/113871a79ef25131/MLKitObjectDetectionCommon-7.0.0.tar.gz</Url>
35-
<Kind>Tgz</Kind>
36-
</XamarinBuildDownload>
29+
<!-- <XamarinBuildDownload Include="$(_MLKitImgLblCommonItemsFolder)">-->
30+
<!-- <Url>https://dl.google.com/dl/cpdc/32805ca33739d2ef/MLKitImageLabelingCommon-7.0.0.tar.gz</Url>-->
31+
<!-- <Kind>Tgz</Kind>-->
32+
<!-- </XamarinBuildDownload>-->
33+
<!-- <XamarinBuildDownload Include="$(_MLKitObjCommonItemsFolder)">-->
34+
<!-- <Url>https://dl.google.com/dl/cpdc/113871a79ef25131/MLKitObjectDetectionCommon-7.0.0.tar.gz</Url>-->
35+
<!-- <Kind>Tgz</Kind>-->
36+
<!-- </XamarinBuildDownload>-->
3737
<XamarinBuildRestoreResources Include="_MLKitCoreDownloadedItems" />
3838
</ItemGroup>
3939
<Target Name="_MLKitCoreDownloadedItems">
@@ -61,34 +61,34 @@
6161
<Frameworks>CoreGraphics CoreMedia CoreVideo Foundation UIKit</Frameworks>
6262
</NativeReference>
6363
<!-- From https://dl.google.com/dl/cpdc/32805ca33739d2ef/MLKitImageLabelingCommon-7.0.0.tar.gz -->
64-
<NativeReference Include="$(_MLKitImgLblCommonSDKBaseFolder)MLKitImageLabelingCommon.framework">
65-
<Kind>Framework</Kind>
66-
<SmartLink>True</SmartLink>
67-
<ForceLoad>True</ForceLoad>
68-
<Frameworks>AVFoundation Accelerate CoreGraphics Foundation LocalAuthentication UIKit</Frameworks>
69-
</NativeReference>
64+
<!-- <NativeReference Include="$(_MLKitImgLblCommonSDKBaseFolder)MLKitImageLabelingCommon.framework">-->
65+
<!-- <Kind>Framework</Kind>-->
66+
<!-- <SmartLink>True</SmartLink>-->
67+
<!-- <ForceLoad>True</ForceLoad>-->
68+
<!-- <Frameworks>AVFoundation Accelerate CoreGraphics Foundation LocalAuthentication UIKit</Frameworks>-->
69+
<!-- </NativeReference>-->
7070
<!-- From https://dl.google.com/dl/cpdc/113871a79ef25131/MLKitObjectDetectionCommon-7.0.0.tar.gz -->
71-
<NativeReference Include="$(_MLKitObjCommonSDKBaseFolder)MLKitObjectDetectionCommon.framework">
72-
<Kind>Framework</Kind>
73-
<SmartLink>True</SmartLink>
74-
<ForceLoad>True</ForceLoad>
75-
<Frameworks>AVFoundation Accelerate CoreGraphics CoreMedia CoreVideo Foundation LocalAuthentication UIKit</Frameworks>
76-
</NativeReference>
77-
</ItemGroup>
78-
<ItemGroup>
79-
<BundleResource Include="$(_MLKitObjCommonResourcesFolder)mobile_object_localizer_3_1_anchors.pb" Visible="False">
80-
<LogicalName>MLKitObjectDetectionCommonResources.bundle\mobile_object_localizer_3_1_anchors.pb</LogicalName>
81-
<Optimize>False</Optimize>
82-
</BundleResource>
83-
<BundleResource Include="$(_MLKitObjCommonResourcesFolder)mobile_object_localizer_labelmap.binarypb" Visible="False">
84-
<LogicalName>MLKitObjectDetectionCommonResources.bundle\mobile_object_localizer_labelmap.binarypb</LogicalName>
85-
<Optimize>False</Optimize>
86-
</BundleResource>
87-
<BundleResource Include="$(_MLKitObjCommonResourcesFolder)tflite_mobile_object_localizer_3_1.tflite" Visible="False">
88-
<LogicalName>MLKitObjectDetectionCommonResources.bundle\tflite_mobile_object_localizer_3_1.tflite</LogicalName>
89-
<Optimize>False</Optimize>
90-
</BundleResource>
71+
<!-- <NativeReference Include="$(_MLKitObjCommonSDKBaseFolder)MLKitObjectDetectionCommon.framework">-->
72+
<!-- <Kind>Framework</Kind>-->
73+
<!-- <SmartLink>True</SmartLink>-->
74+
<!-- <ForceLoad>True</ForceLoad>-->
75+
<!-- <Frameworks>AVFoundation Accelerate CoreGraphics CoreMedia CoreVideo Foundation LocalAuthentication UIKit</Frameworks>-->
76+
<!-- </NativeReference>-->
9177
</ItemGroup>
78+
<!-- <ItemGroup>-->
79+
<!-- <BundleResource Include="$(_MLKitObjCommonResourcesFolder)mobile_object_localizer_3_1_anchors.pb" Visible="False">-->
80+
<!-- <LogicalName>MLKitObjectDetectionCommonResources.bundle\mobile_object_localizer_3_1_anchors.pb</LogicalName>-->
81+
<!-- <Optimize>False</Optimize>-->
82+
<!-- </BundleResource>-->
83+
<!-- <BundleResource Include="$(_MLKitObjCommonResourcesFolder)mobile_object_localizer_labelmap.binarypb" Visible="False">-->
84+
<!-- <LogicalName>MLKitObjectDetectionCommonResources.bundle\mobile_object_localizer_labelmap.binarypb</LogicalName>-->
85+
<!-- <Optimize>False</Optimize>-->
86+
<!-- </BundleResource>-->
87+
<!-- <BundleResource Include="$(_MLKitObjCommonResourcesFolder)tflite_mobile_object_localizer_3_1.tflite" Visible="False">-->
88+
<!-- <LogicalName>MLKitObjectDetectionCommonResources.bundle\tflite_mobile_object_localizer_3_1.tflite</LogicalName>-->
89+
<!-- <Optimize>False</Optimize>-->
90+
<!-- </BundleResource>-->
91+
<!-- </ItemGroup>-->
9292
</Target>
9393
<PropertyGroup>
9494
<_GoogleToolboxForMacId>GoogleToolboxForMac</_GoogleToolboxForMacId>
@@ -102,9 +102,9 @@
102102
<_NativeReference Include="$(MSBuildThisFileDirectory)..\lib\xamarinios10\MLKit.Core.resources\GoogleUtilitiesComponents.xcframework">
103103
<_Id>$(_GoogleUtilitiesComponentsId)</_Id>
104104
</_NativeReference>
105-
<_NativeReference Include="$(MSBuildThisFileDirectory)..\lib\xamarinios10\MLKit.Core.resources\SSZipArchive.xcframework">
106-
<_Id>$(_SSZipArchiveId)</_Id>
107-
</_NativeReference>
105+
<!-- <_NativeReference Include="$(MSBuildThisFileDirectory)..\lib\xamarinios10\MLKit.Core.resources\SSZipArchive.xcframework">-->
106+
<!-- <_Id>$(_SSZipArchiveId)</_Id>-->
107+
<!-- </_NativeReference>-->
108108
</ItemGroup>
109109
<Target Name="_ResolveNativeReferencesForMLKitCore"
110110
BeforeTargets="ResolveNativeReferences"
@@ -121,12 +121,12 @@
121121
<SmartLink>True</SmartLink>
122122
<ForceLoad>True</ForceLoad>
123123
</_NativeReference>
124-
<_NativeReference Update="@(_NativeReference)" Condition="'%(_NativeReference._Id)' == '$(_SSZipArchiveId)'">
125-
<Kind>Framework</Kind>
126-
<SmartLink>True</SmartLink>
127-
<ForceLoad>True</ForceLoad>
128-
<LinkerFlags>-lz -liconv</LinkerFlags>
129-
</_NativeReference>
124+
<!-- <_NativeReference Update="@(_NativeReference)" Condition="'%(_NativeReference._Id)' == '$(_SSZipArchiveId)'">-->
125+
<!-- <Kind>Framework</Kind>-->
126+
<!-- <SmartLink>True</SmartLink>-->
127+
<!-- <ForceLoad>True</ForceLoad>-->
128+
<!-- <LinkerFlags>-lz -liconv</LinkerFlags>-->
129+
<!-- </_NativeReference>-->
130130
<NativeReference Include="@(_NativeReference)" />
131131
</ItemGroup>
132132
</Target>

0 commit comments

Comments
 (0)