RDART-1039: Drop catalyst support. Flutter doesn't support it (#1696)

* Drop catalyst support. Flutter doesn't support it * Update CHANGELOG
realm · May 28, 2024 · 413e21a · 413e21a
1 parent 7384897
commit 413e21a
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 23 deletions.
diff --git a/.github/workflows/binary-combine-ios.yml b/.github/workflows/binary-combine-ios.yml
@@ -15,23 +15,18 @@ jobs:
         with:
           name: librealm-ios-device
           path: binary/ios
+
       - name: Fetch simulator build
         uses: actions/download-artifact@v4
         with:
           name: librealm-ios-simulator
           path: binary/ios
-      - name: Fetch catalyst build
-        uses: actions/download-artifact@v4
-        with:
-          name: librealm-ios-catalyst
-          path: binary/ios
 
       - name: Build .xcframework
         run: |
           xcodebuild -create-xcframework \
             -framework ./binary/ios/Release-iphoneos/realm_dart.framework \
             -framework ./binary/ios/Release-iphonesimulator/realm_dart.framework \
-            -framework ./binary/ios/Release-maccatalyst/realm_dart.framework \
             -output ./binary/ios/realm_dart.xcframework
           rm -rf ./binary/ios/Release-*
 
@@ -48,5 +43,4 @@ jobs:
           name: |
             librealm-ios-device
             librealm-ios-simulator
-            librealm-ios-catalyst
           failOnError: false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,7 +53,7 @@ jobs:
     with:
       runner: macos-12
       binary: ios
-      build: '["ios-device", "ios-simulator", "ios-catalyst"]'
+      build: '["ios-device", "ios-simulator"]'
 
   build-android-combined:
     name: Build combine Android

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 ### Internal
 * Using Core 14.7.0.
 * Disabled codesigning of Apple binaries. (Issue [#1679](https://github.com/realm/realm-dart/issues/1679))
+* Drop building xcframework for catalyst. (Issue [#1695](https://github.com/realm/realm-dart/issues/1695))
 
 ## 2.3.0 (2024-05-23)
 

diff --git a/packages/realm_dart/CMakePresets.json b/packages/realm_dart/CMakePresets.json
@@ -185,15 +185,6 @@
         "xcode_destination": "generic/platform=iOS Simulator"
       },
       "configuration": "Debug"
-    },
-    {
-      "name": "ios-catalyst",
-      "displayName": "Catalyst",
-      "inherits": "ios",
-      "environment": {
-        "xcode_destination": "generic/platform=macOS,variant=Mac Catalyst"
-      },
-      "configuration": "Debug"
     }
   ]
 }
diff --git a/packages/realm_dart/dev/lib/src/build.dart b/packages/realm_dart/dev/lib/src/build.dart
@@ -38,7 +38,7 @@ enum Architecture {
 enum iOSSdk {
   iPhoneOS('device'),
   iPhoneSimulator('simulator'),
-  ; // flutter doesn't support maccatalyst (yet?)
+  ; // flutter doesn't support catalyst (yet https://github.com/flutter/flutter/issues/33860?)
 
   final String? _cmakeName;
   String get cmakeName => _cmakeName ?? name;

diff --git a/packages/realm_dart/scripts/build-ios.sh b/packages/realm_dart/scripts/build-ios.sh
@@ -13,7 +13,7 @@ function usage {
     echo ""
     echo "Arguments:"
     echo "   -c : build configuration (Debug or Release)"
-    echo "   <platforms> : platforms to build for (catalyst, ios, or simulator)"
+    echo "   <platforms> : platforms to build for (ios, or simulator)"
     echo "                                                                     "
     echo "Environment variables:"
     echo "  REALM_USE_CCACHE=TRUE - enables ccache builds"
@@ -66,10 +66,6 @@ for platform in "${PLATFORMS[@]}"; do
             cmake --build --preset ios-device --config $CONFIGURATION
             FRAMEWORKS+=(-framework ./binary/ios/$CONFIGURATION-iphoneos/realm_dart.framework)
         ;;
-        catalyst)
-            cmake --build --preset ios-catalyst --config $CONFIGURATION
-            FRAMEWORKS+=(-framework ./binary/ios/$CONFIGURATION-maccatalyst/realm_dart.framework)
-        ;;
         simulator)
             cmake --build --preset ios-simulator --config $CONFIGURATION
             FRAMEWORKS+=(-framework ./binary/ios/$CONFIGURATION-iphonesimulator/realm_dart.framework)