Skip to content

Commit 413e21a

Browse files
author
Kasper Overgård Nielsen
authored
RDART-1039: Drop catalyst support. Flutter doesn't support it (#1696)
* Drop catalyst support. Flutter doesn't support it * Update CHANGELOG
1 parent 7384897 commit 413e21a

File tree

6 files changed

+5
-23
lines changed

6 files changed

+5
-23
lines changed

.github/workflows/binary-combine-ios.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,18 @@ jobs:
1515
with:
1616
name: librealm-ios-device
1717
path: binary/ios
18+
1819
- name: Fetch simulator build
1920
uses: actions/download-artifact@v4
2021
with:
2122
name: librealm-ios-simulator
2223
path: binary/ios
23-
- name: Fetch catalyst build
24-
uses: actions/download-artifact@v4
25-
with:
26-
name: librealm-ios-catalyst
27-
path: binary/ios
2824

2925
- name: Build .xcframework
3026
run: |
3127
xcodebuild -create-xcframework \
3228
-framework ./binary/ios/Release-iphoneos/realm_dart.framework \
3329
-framework ./binary/ios/Release-iphonesimulator/realm_dart.framework \
34-
-framework ./binary/ios/Release-maccatalyst/realm_dart.framework \
3530
-output ./binary/ios/realm_dart.xcframework
3631
rm -rf ./binary/ios/Release-*
3732
@@ -48,5 +43,4 @@ jobs:
4843
name: |
4944
librealm-ios-device
5045
librealm-ios-simulator
51-
librealm-ios-catalyst
5246
failOnError: false

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
with:
5454
runner: macos-12
5555
binary: ios
56-
build: '["ios-device", "ios-simulator", "ios-catalyst"]'
56+
build: '["ios-device", "ios-simulator"]'
5757

5858
build-android-combined:
5959
name: Build combine Android

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
### Internal
1313
* Using Core 14.7.0.
1414
* Disabled codesigning of Apple binaries. (Issue [#1679](https://github.com/realm/realm-dart/issues/1679))
15+
* Drop building xcframework for catalyst. (Issue [#1695](https://github.com/realm/realm-dart/issues/1695))
1516

1617
## 2.3.0 (2024-05-23)
1718

packages/realm_dart/CMakePresets.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,6 @@
185185
"xcode_destination": "generic/platform=iOS Simulator"
186186
},
187187
"configuration": "Debug"
188-
},
189-
{
190-
"name": "ios-catalyst",
191-
"displayName": "Catalyst",
192-
"inherits": "ios",
193-
"environment": {
194-
"xcode_destination": "generic/platform=macOS,variant=Mac Catalyst"
195-
},
196-
"configuration": "Debug"
197188
}
198189
]
199190
}

packages/realm_dart/dev/lib/src/build.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ enum Architecture {
3838
enum iOSSdk {
3939
iPhoneOS('device'),
4040
iPhoneSimulator('simulator'),
41-
; // flutter doesn't support maccatalyst (yet?)
41+
; // flutter doesn't support catalyst (yet https://github.com/flutter/flutter/issues/33860?)
4242

4343
final String? _cmakeName;
4444
String get cmakeName => _cmakeName ?? name;

packages/realm_dart/scripts/build-ios.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function usage {
1313
echo ""
1414
echo "Arguments:"
1515
echo " -c : build configuration (Debug or Release)"
16-
echo " <platforms> : platforms to build for (catalyst, ios, or simulator)"
16+
echo " <platforms> : platforms to build for (ios, or simulator)"
1717
echo " "
1818
echo "Environment variables:"
1919
echo " REALM_USE_CCACHE=TRUE - enables ccache builds"
@@ -66,10 +66,6 @@ for platform in "${PLATFORMS[@]}"; do
6666
cmake --build --preset ios-device --config $CONFIGURATION
6767
FRAMEWORKS+=(-framework ./binary/ios/$CONFIGURATION-iphoneos/realm_dart.framework)
6868
;;
69-
catalyst)
70-
cmake --build --preset ios-catalyst --config $CONFIGURATION
71-
FRAMEWORKS+=(-framework ./binary/ios/$CONFIGURATION-maccatalyst/realm_dart.framework)
72-
;;
7369
simulator)
7470
cmake --build --preset ios-simulator --config $CONFIGURATION
7571
FRAMEWORKS+=(-framework ./binary/ios/$CONFIGURATION-iphonesimulator/realm_dart.framework)

0 commit comments

Comments
 (0)