Skip to content

Commit 33d7334

Browse files
authored
Delete references to on-device APIs (#6296)
* Restores ML Pods after M77. * Delete references to on-device APIs, which have moved to a standalone MLKit.
1 parent 0d729f1 commit 33d7334

File tree

1 file changed

+0
-53
lines changed

1 file changed

+0
-53
lines changed

Firebase/CoreDiagnostics/FIRCDLibrary/FIRCoreDiagnostics.m

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,6 @@
5151
#define kDeploymentType logs_proto_mobilesdk_ios_ICoreConfiguration_DeploymentType_COCOAPODS
5252
#endif
5353

54-
static NSString *const kFIRServiceMLVisionOnDeviceAutoML = @"MLVisionOnDeviceAutoML";
55-
static NSString *const kFIRServiceMLVisionOnDeviceFace = @"MLVisionOnDeviceFace";
56-
static NSString *const kFIRServiceMLVisionOnDeviceBarcode = @"MLVisionOnDeviceBarcode";
57-
static NSString *const kFIRServiceMLVisionOnDeviceText = @"MLVisionOnDeviceText";
58-
static NSString *const kFIRServiceMLVisionOnDeviceLabel = @"MLVisionOnDeviceLabel";
59-
static NSString *const kFIRServiceMLVisionOnDeviceObjectDetection =
60-
@"MLVisionOnDeviceObjectDetection";
6154
static NSString *const kFIRServiceMLModelInterpreter = @"MLModelInterpreter";
6255

6356
static NSString *const kFIRServiceAdMob = @"AdMob";
@@ -269,18 +262,6 @@ logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType FIRMapFromServiceStringT
269262
kFIRServicePerformance :
270263
@(logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType_PERFORMANCE),
271264
kFIRServiceStorage : @(logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType_STORAGE),
272-
kFIRServiceMLVisionOnDeviceAutoML :
273-
@(logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType_ML_VISION_ON_DEVICE_AUTOML),
274-
kFIRServiceMLVisionOnDeviceFace :
275-
@(logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType_ML_VISION_ON_DEVICE_FACE),
276-
kFIRServiceMLVisionOnDeviceBarcode :
277-
@(logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType_ML_VISION_ON_DEVICE_BARCODE),
278-
kFIRServiceMLVisionOnDeviceText :
279-
@(logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType_ML_VISION_ON_DEVICE_TEXT),
280-
kFIRServiceMLVisionOnDeviceLabel :
281-
@(logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType_ML_VISION_ON_DEVICE_LABEL),
282-
kFIRServiceMLVisionOnDeviceObjectDetection : @(
283-
logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType_ML_VISION_ON_DEVICE_OBJECT_DETECTION),
284265
kFIRServiceMLModelInterpreter :
285266
@(logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType_ML_MODEL_INTERPRETER),
286267
kGGLServiceAnalytics : @(logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType_ANALYTICS),
@@ -421,40 +402,6 @@ void FIRPopulateProtoWithInstalledServices(logs_proto_mobilesdk_ios_ICoreConfigu
421402
[sdkServiceInstalledArray
422403
addObject:@(FIRMapFromServiceStringToTypeEnum(kFIRServiceMeasurement))];
423404
}
424-
// ML Vision On Device AutoML.
425-
if (NSClassFromString(@"FIRVisionOnDeviceAutoMLImageLabelerOptions") != nil) {
426-
[sdkServiceInstalledArray
427-
addObject:@(FIRMapFromServiceStringToTypeEnum(kFIRServiceMLVisionOnDeviceAutoML))];
428-
}
429-
// ML Vision On Device Face.
430-
if (NSClassFromString(@"FIRVisionFaceDetector") != nil &&
431-
NSClassFromString(@"GMVFaceDetector") != nil) {
432-
[sdkServiceInstalledArray
433-
addObject:@(FIRMapFromServiceStringToTypeEnum(kFIRServiceMLVisionOnDeviceFace))];
434-
}
435-
// ML Vision On Device Barcode.
436-
if (NSClassFromString(@"FIRVisionBarcodeDetector") != nil &&
437-
NSClassFromString(@"GMVBarcodeDetector") != nil) {
438-
[sdkServiceInstalledArray
439-
addObject:@(FIRMapFromServiceStringToTypeEnum(kFIRServiceMLVisionOnDeviceBarcode))];
440-
}
441-
// ML Vision On Device Text.
442-
if (NSClassFromString(@"FIRVisionTextDetector") != nil &&
443-
NSClassFromString(@"GMVTextDetector") != nil) {
444-
[sdkServiceInstalledArray
445-
addObject:@(FIRMapFromServiceStringToTypeEnum(kFIRServiceMLVisionOnDeviceText))];
446-
}
447-
// ML Vision On Device Image Label.
448-
if (NSClassFromString(@"FIRVisionLabelDetector") != nil &&
449-
NSClassFromString(@"GMVLabelDetector") != nil) {
450-
[sdkServiceInstalledArray
451-
addObject:@(FIRMapFromServiceStringToTypeEnum(kFIRServiceMLVisionOnDeviceLabel))];
452-
}
453-
// ML Vision On Device Object.
454-
if (NSClassFromString(@"FIRVisionObjectDetector") != nil) {
455-
[sdkServiceInstalledArray
456-
addObject:@(FIRMapFromServiceStringToTypeEnum(kFIRServiceMLVisionOnDeviceObjectDetection))];
457-
}
458405
// ML Model Interpreter
459406
if (NSClassFromString(@"FIRCustomModelInterpreter") != nil) {
460407
[sdkServiceInstalledArray

0 commit comments

Comments
 (0)