xcodebuild CI: umbrella ML Kit headers + static-lib target type

shai-almog · claude · shai-almog · commit 0fc10064f695 · 2026-05-26T18:44:08.000+03:00
Two iterations on the matrix:

1. The per-class ML Kit header paths I was using
   (`&lt;MLKitTextRecognition/MLKTextRecognizer.h&gt;` etc.) aren't actually
   exported by the GoogleMLKit pods. ML Kit ships ONE umbrella header
   per framework, named after the framework itself. Switch every iOS
   bridge to import the umbrella (`&lt;MLKitTextRecognition/MLKitText
   Recognition.h&gt;`, `&lt;MLKitVision/MLKitVision.h&gt;`, etc.) so clang's
   framework header search resolves and the public classes -- which
   the umbrella re-exports -- stay visible to the .m bodies.

2. The cn1libs that ship without a CocoaPod (whisper / stable
   diffusion) declare extern symbols that the real build server
   resolves against the bundled static library / Swift runner. The
   probe build had no such library so the link phase failed.
   Switch the probe target from `framework` to `library.static` --
   .a archives don't link, they archive .o files, so unresolved
   externs are fine. We still compile-check every source file,
   which is the whole point of this gate.

3. Also fix tflite's umbrella import: the pod is
   `TensorFlowLiteObjC` but the produced framework's module name --
   the one used in the angle-bracket prefix -- is
   `TFLTensorFlowLite`. So `&lt;TFLTensorFlowLite/TFLTensorFlowLite.h&gt;`,
   not `&lt;TensorFlowLiteObjC/...&gt;`.

Co-Authored-By: Claude Opus 4.7 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/.github/workflows/ai-cn1lib-native-check.yml b/.github/workflows/ai-cn1lib-native-check.yml
@@ -86,7 +86,12 @@ jobs:
               iOS: "14.0"
           targets:
             CN1AIProbe:
-              type: framework
+              # Static library: archives .o files without linking, so cn1libs
+              # that reference externs supplied by the real build server
+              # (libwhisper.a for whisper, cn1_sd_generate for stable
+              # diffusion, the actual ML Kit framework binaries) still
+              # compile-check successfully.
+              type: library.static
               platform: iOS
               sources:
                 - path: CN1AIProbe
@@ -95,9 +100,6 @@ jobs:
                   CLANG_ENABLE_MODULES: YES
                   CLANG_ENABLE_OBJC_ARC: YES
                   CODE_SIGNING_ALLOWED: NO
-                  GENERATE_INFOPLIST_FILE: YES
-                  DEFINES_MODULE: YES
-                  PRODUCT_BUNDLE_IDENTIFIER: com.codenameone.cn1ai.probe
           YAML
           cd "$PROBE"
           xcodegen generate --spec project.yml
diff --git a/maven/cn1-ai-mlkit-barcode/ios/src/main/objectivec/com_codename1_ai_mlkit_barcode_NativeBarcodeScannerImpl.m b/maven/cn1-ai-mlkit-barcode/ios/src/main/objectivec/com_codename1_ai_mlkit_barcode_NativeBarcodeScannerImpl.m
@@ -1,9 +1,7 @@
 #import "com_codename1_ai_mlkit_barcode_NativeBarcodeScannerImpl.h"
 #import <UIKit/UIKit.h>
-#import <MLKitBarcodeScanning/MLKBarcodeScanner.h>
-#import <MLKitBarcodeScanning/MLKBarcodeScannerOptions.h>
-#import <MLKitBarcodeScanning/MLKBarcode.h>
-#import <MLKitVision/MLKVisionImage.h>
+#import <MLKitBarcodeScanning/MLKitBarcodeScanning.h>
+#import <MLKitVision/MLKitVision.h>
 #import <arpa/inet.h>
 
 @implementation com_codename1_ai_mlkit_barcode_NativeBarcodeScannerImpl
diff --git a/maven/cn1-ai-mlkit-face/ios/src/main/objectivec/com_codename1_ai_mlkit_face_NativeFaceDetectorImpl.m b/maven/cn1-ai-mlkit-face/ios/src/main/objectivec/com_codename1_ai_mlkit_face_NativeFaceDetectorImpl.m
@@ -1,9 +1,7 @@
 #import "com_codename1_ai_mlkit_face_NativeFaceDetectorImpl.h"
 #import <UIKit/UIKit.h>
-#import <MLKitFaceDetection/MLKFaceDetector.h>
-#import <MLKitFaceDetection/MLKFaceDetectorOptions.h>
-#import <MLKitFaceDetection/MLKFace.h>
-#import <MLKitVision/MLKVisionImage.h>
+#import <MLKitFaceDetection/MLKitFaceDetection.h>
+#import <MLKitVision/MLKitVision.h>
 #import <arpa/inet.h>
 
 @implementation com_codename1_ai_mlkit_face_NativeFaceDetectorImpl
diff --git a/maven/cn1-ai-mlkit-labeling/ios/src/main/objectivec/com_codename1_ai_mlkit_labeling_NativeImageLabelerImpl.m b/maven/cn1-ai-mlkit-labeling/ios/src/main/objectivec/com_codename1_ai_mlkit_labeling_NativeImageLabelerImpl.m
@@ -1,9 +1,7 @@
 #import "com_codename1_ai_mlkit_labeling_NativeImageLabelerImpl.h"
 #import <UIKit/UIKit.h>
-#import <MLKitImageLabeling/MLKImageLabeler.h>
-#import <MLKitImageLabeling/MLKImageLabelerOptions.h>
-#import <MLKitImageLabeling/MLKImageLabel.h>
-#import <MLKitVision/MLKVisionImage.h>
+#import <MLKitImageLabeling/MLKitImageLabeling.h>
+#import <MLKitVision/MLKitVision.h>
 #import <arpa/inet.h>
 
 @implementation com_codename1_ai_mlkit_labeling_NativeImageLabelerImpl
diff --git a/maven/cn1-ai-mlkit-langid/ios/src/main/objectivec/com_codename1_ai_mlkit_langid_NativeLanguageIdentifierImpl.m b/maven/cn1-ai-mlkit-langid/ios/src/main/objectivec/com_codename1_ai_mlkit_langid_NativeLanguageIdentifierImpl.m
@@ -1,6 +1,6 @@
 #import "com_codename1_ai_mlkit_langid_NativeLanguageIdentifierImpl.h"
 #import <UIKit/UIKit.h>
-#import <MLKitLanguageID/MLKLanguageIdentification.h>
+#import <MLKitLanguageID/MLKitLanguageID.h>
 
 @implementation com_codename1_ai_mlkit_langid_NativeLanguageIdentifierImpl
 
diff --git a/maven/cn1-ai-mlkit-pose/ios/src/main/objectivec/com_codename1_ai_mlkit_pose_NativePoseDetectorImpl.m b/maven/cn1-ai-mlkit-pose/ios/src/main/objectivec/com_codename1_ai_mlkit_pose_NativePoseDetectorImpl.m
@@ -1,10 +1,7 @@
 #import "com_codename1_ai_mlkit_pose_NativePoseDetectorImpl.h"
 #import <UIKit/UIKit.h>
-#import <MLKitPoseDetection/MLKPoseDetector.h>
-#import <MLKitPoseDetection/MLKPoseDetectorOptions.h>
-#import <MLKitPoseDetection/MLKPose.h>
-#import <MLKitPoseDetection/MLKPoseLandmark.h>
-#import <MLKitVision/MLKVisionImage.h>
+#import <MLKitPoseDetection/MLKitPoseDetection.h>
+#import <MLKitVision/MLKitVision.h>
 
 @implementation com_codename1_ai_mlkit_pose_NativePoseDetectorImpl
 
diff --git a/maven/cn1-ai-mlkit-segmentation/ios/src/main/objectivec/com_codename1_ai_mlkit_segmentation_NativeSelfieSegmenterImpl.m b/maven/cn1-ai-mlkit-segmentation/ios/src/main/objectivec/com_codename1_ai_mlkit_segmentation_NativeSelfieSegmenterImpl.m
@@ -1,9 +1,7 @@
 #import "com_codename1_ai_mlkit_segmentation_NativeSelfieSegmenterImpl.h"
 #import <UIKit/UIKit.h>
-#import <MLKitSegmentationSelfie/MLKSelfieSegmenterOptions.h>
-#import <MLKitSegmentationCommon/MLKSegmenter.h>
-#import <MLKitSegmentationCommon/MLKSegmentationMask.h>
-#import <MLKitVision/MLKVisionImage.h>
+#import <MLKitSegmentationSelfie/MLKitSegmentationSelfie.h>
+#import <MLKitVision/MLKitVision.h>
 #import <CoreVideo/CoreVideo.h>
 
 @implementation com_codename1_ai_mlkit_segmentation_NativeSelfieSegmenterImpl
diff --git a/maven/cn1-ai-mlkit-smartreply/ios/src/main/objectivec/com_codename1_ai_mlkit_smartreply_NativeSmartReplyImpl.m b/maven/cn1-ai-mlkit-smartreply/ios/src/main/objectivec/com_codename1_ai_mlkit_smartreply_NativeSmartReplyImpl.m
@@ -1,9 +1,6 @@
 #import "com_codename1_ai_mlkit_smartreply_NativeSmartReplyImpl.h"
 #import <UIKit/UIKit.h>
-#import <MLKitSmartReply/MLKSmartReply.h>
-#import <MLKitSmartReply/MLKTextMessage.h>
-#import <MLKitSmartReply/MLKSmartReplySuggestion.h>
-#import <MLKitSmartReply/MLKSmartReplySuggestionResult.h>
+#import <MLKitSmartReply/MLKitSmartReply.h>
 #import <arpa/inet.h>
 
 @implementation com_codename1_ai_mlkit_smartreply_NativeSmartReplyImpl
diff --git a/maven/cn1-ai-mlkit-text/common/codenameone_library_required.properties b/maven/cn1-ai-mlkit-text/common/codenameone_library_required.properties
@@ -4,6 +4,3 @@
 # further per-class entries as needed.
 codename1.arg.ios.pods=GoogleMLKit/TextRecognition
 codename1.arg.android.gradleDep=implementation 'com.google.mlkit:text-recognition:16.0.0'
-
-
-
diff --git a/maven/cn1-ai-mlkit-text/ios/src/main/objectivec/com_codename1_ai_mlkit_text_NativeTextRecognizerImpl.m b/maven/cn1-ai-mlkit-text/ios/src/main/objectivec/com_codename1_ai_mlkit_text_NativeTextRecognizerImpl.m
@@ -1,9 +1,7 @@
 #import "com_codename1_ai_mlkit_text_NativeTextRecognizerImpl.h"
 #import <UIKit/UIKit.h>
-#import <MLKitTextRecognition/MLKTextRecognizer.h>
-#import <MLKitTextRecognition/MLKTextRecognizerOptions.h>
-#import <MLKitVision/MLKVisionImage.h>
-#import <MLKitVision/MLKText.h>
+#import <MLKitTextRecognition/MLKitTextRecognition.h>
+#import <MLKitVision/MLKitVision.h>
 
 @implementation com_codename1_ai_mlkit_text_NativeTextRecognizerImpl
 
diff --git a/maven/cn1-ai-mlkit-translate/ios/src/main/objectivec/com_codename1_ai_mlkit_translate_NativeTranslatorImpl.m b/maven/cn1-ai-mlkit-translate/ios/src/main/objectivec/com_codename1_ai_mlkit_translate_NativeTranslatorImpl.m
@@ -1,8 +1,7 @@
 #import "com_codename1_ai_mlkit_translate_NativeTranslatorImpl.h"
 #import <UIKit/UIKit.h>
-#import <MLKitTranslate/MLKTranslator.h>
-#import <MLKitTranslate/MLKTranslatorOptions.h>
-#import <MLKitCommon/MLKModelDownloadConditions.h>
+#import <MLKitTranslate/MLKitTranslate.h>
+#import <MLKitCommon/MLKitCommon.h>
 
 @implementation com_codename1_ai_mlkit_translate_NativeTranslatorImpl
 
diff --git a/maven/cn1-ai-tflite/ios/src/main/objectivec/com_codename1_ai_tflite_NativeInterpreterImpl.m b/maven/cn1-ai-tflite/ios/src/main/objectivec/com_codename1_ai_tflite_NativeInterpreterImpl.m
@@ -1,6 +1,6 @@
 #import "com_codename1_ai_tflite_NativeInterpreterImpl.h"
 #import <UIKit/UIKit.h>
-#import <TensorFlowLiteObjC/TFLTensorFlowLite.h>
+#import <TFLTensorFlowLite/TFLTensorFlowLite.h>
 
 @implementation com_codename1_ai_tflite_NativeInterpreterImpl
 
diff --git a/scripts/gen-ai-cn1libs.py b/scripts/gen-ai-cn1libs.py
@@ -842,11 +842,13 @@ def lib_mlkit_text() -> Lib:
             return result;
         }
         """)
+    # ML Kit ships per-framework umbrella headers (named after the
+    # framework itself, e.g. MLKitTextRecognition.h). Importing the
+    # umbrella pulls every public class -- the per-class header paths
+    # we previously used aren't actually exported.
     ios_imports = textwrap.dedent("""\
-        #import <MLKitTextRecognition/MLKTextRecognizer.h>
-        #import <MLKitTextRecognition/MLKTextRecognizerOptions.h>
-        #import <MLKitVision/MLKVisionImage.h>
-        #import <MLKitVision/MLKText.h>
+        #import <MLKitTextRecognition/MLKitTextRecognition.h>
+        #import <MLKitVision/MLKitVision.h>
         """)
 
     android_impl = textwrap.dedent("""\
@@ -1023,10 +1025,8 @@ def lib_mlkit_barcode() -> Lib:
         }
         """)
     ios_imports = textwrap.dedent("""\
-        #import <MLKitBarcodeScanning/MLKBarcodeScanner.h>
-        #import <MLKitBarcodeScanning/MLKBarcodeScannerOptions.h>
-        #import <MLKitBarcodeScanning/MLKBarcode.h>
-        #import <MLKitVision/MLKVisionImage.h>
+        #import <MLKitBarcodeScanning/MLKitBarcodeScanning.h>
+        #import <MLKitVision/MLKitVision.h>
         #import <arpa/inet.h>
         """)
     android_impl = textwrap.dedent("""\
@@ -1181,10 +1181,8 @@ def lib_mlkit_face() -> Lib:
         }
         """)
     ios_imports = textwrap.dedent("""\
-        #import <MLKitFaceDetection/MLKFaceDetector.h>
-        #import <MLKitFaceDetection/MLKFaceDetectorOptions.h>
-        #import <MLKitFaceDetection/MLKFace.h>
-        #import <MLKitVision/MLKVisionImage.h>
+        #import <MLKitFaceDetection/MLKitFaceDetection.h>
+        #import <MLKitVision/MLKitVision.h>
         #import <arpa/inet.h>
         """)
     android_impl = textwrap.dedent("""\
@@ -1381,10 +1379,8 @@ def lib_mlkit_labeling() -> Lib:
         }
         """)
     ios_imports = textwrap.dedent("""\
-        #import <MLKitImageLabeling/MLKImageLabeler.h>
-        #import <MLKitImageLabeling/MLKImageLabelerOptions.h>
-        #import <MLKitImageLabeling/MLKImageLabel.h>
-        #import <MLKitVision/MLKVisionImage.h>
+        #import <MLKitImageLabeling/MLKitImageLabeling.h>
+        #import <MLKitVision/MLKitVision.h>
         #import <arpa/inet.h>
         """)
     android_impl = textwrap.dedent("""\
@@ -1515,9 +1511,8 @@ def lib_mlkit_translate() -> Lib:
         }
         """)
     ios_imports = textwrap.dedent("""\
-        #import <MLKitTranslate/MLKTranslator.h>
-        #import <MLKitTranslate/MLKTranslatorOptions.h>
-        #import <MLKitCommon/MLKModelDownloadConditions.h>
+        #import <MLKitTranslate/MLKitTranslate.h>
+        #import <MLKitCommon/MLKitCommon.h>
         """)
     android_impl = textwrap.dedent("""\
         public String translate(String text, String sourceLang, String targetLang) {
@@ -1647,10 +1642,7 @@ def lib_mlkit_smartreply() -> Lib:
         }
         """)
     ios_imports = textwrap.dedent("""\
-        #import <MLKitSmartReply/MLKSmartReply.h>
-        #import <MLKitSmartReply/MLKTextMessage.h>
-        #import <MLKitSmartReply/MLKSmartReplySuggestion.h>
-        #import <MLKitSmartReply/MLKSmartReplySuggestionResult.h>
+        #import <MLKitSmartReply/MLKitSmartReply.h>
         #import <arpa/inet.h>
         """)
     android_impl = textwrap.dedent("""\
@@ -1750,7 +1742,7 @@ def lib_mlkit_langid() -> Lib:
             return result;
         }
         """)
-    ios_imports = "#import <MLKitLanguageID/MLKLanguageIdentification.h>\n"
+    ios_imports = "#import <MLKitLanguageID/MLKitLanguageID.h>\n"
     android_impl = textwrap.dedent("""\
         public String identify(String input) {
             com.google.mlkit.nl.languageid.LanguageIdentifier id =
@@ -1870,11 +1862,8 @@ def lib_mlkit_pose() -> Lib:
         }
         """)
     ios_imports = textwrap.dedent("""\
-        #import <MLKitPoseDetection/MLKPoseDetector.h>
-        #import <MLKitPoseDetection/MLKPoseDetectorOptions.h>
-        #import <MLKitPoseDetection/MLKPose.h>
-        #import <MLKitPoseDetection/MLKPoseLandmark.h>
-        #import <MLKitVision/MLKVisionImage.h>
+        #import <MLKitPoseDetection/MLKitPoseDetection.h>
+        #import <MLKitVision/MLKitVision.h>
         """)
     android_impl = textwrap.dedent("""\
         public float[] detect(byte[] imageBytes) {
@@ -2014,10 +2003,8 @@ def lib_mlkit_segmentation() -> Lib:
         }
         """)
     ios_imports = textwrap.dedent("""\
-        #import <MLKitSegmentationSelfie/MLKSelfieSegmenterOptions.h>
-        #import <MLKitSegmentationCommon/MLKSegmenter.h>
-        #import <MLKitSegmentationCommon/MLKSegmentationMask.h>
-        #import <MLKitVision/MLKVisionImage.h>
+        #import <MLKitSegmentationSelfie/MLKitSegmentationSelfie.h>
+        #import <MLKitVision/MLKitVision.h>
         #import <CoreVideo/CoreVideo.h>
         """)
     android_impl = textwrap.dedent("""\
@@ -2258,7 +2245,11 @@ def lib_tflite() -> Lib:
             return outBytes ?: [NSData data];
         }
         """)
-    ios_imports = "#import <TensorFlowLiteObjC/TFLTensorFlowLite.h>\n"
+    # TensorFlowLiteObjC pod installs the `TFLTensorFlowLite` framework
+    # with umbrella header `TFLTensorFlowLite.h`. The framework dir
+    # name (used as the angle-bracket prefix) is the module name
+    # `TFLTensorFlowLite`, not the pod name `TensorFlowLiteObjC`.
+    ios_imports = "#import <TFLTensorFlowLite/TFLTensorFlowLite.h>\n"
     android_impl = textwrap.dedent("""\
         public float[] run(byte[] modelBytes, float[] input, int outputLength) {
             java.nio.ByteBuffer bb = java.nio.ByteBuffer.allocateDirect(modelBytes.length);
