Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[clockkit] Add missing 'CLKComplicationFamily' enum values #4818

Merged
merged 2 commits into from Sep 14, 2018

Conversation

VincentDondain
Copy link
Contributor

From Xcode 10 GM API diff: https://github.com/xamarin/xamarin-macios/wiki/ClockKit-watchOS-xcode10-GM

--- /Applications/Xcode10-beta6.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ClockKit.framework/Headers/CLKDefines.h	2018-08-10 17:39:53.000000000 -0400
+++ /Applications/Xcode10GM.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ClockKit.framework/Headers/CLKDefines.h	2018-08-29 05:55:06.000000000 -0400
@@ -19,6 +19,10 @@
     CLKComplicationFamilyCircularSmall                                                        = 4,
     CLKComplicationFamilyExtraLarge CLK_AVAILABLE_WATCHOS_IOS(3_0, 10_0)                      = 7,
     
+    CLKComplicationFamilyGraphicCorner CLK_AVAILABLE_WATCHOS_IOS(5_0, 12_0)                 = 8,
+    CLKComplicationFamilyGraphicBezel CLK_AVAILABLE_WATCHOS_IOS(5_0, 12_0)                  = 9,
+    CLKComplicationFamilyGraphicCircular CLK_AVAILABLE_WATCHOS_IOS(5_0, 12_0)               = 10,
+    CLKComplicationFamilyGraphicRectangular CLK_AVAILABLE_WATCHOS_IOS(5_0, 12_0)            = 11,
 };

These are important enum values related to the new "graphic" complications types.

From Xcode 10 GM API diff: https://github.com/xamarin/xamarin-macios/wiki/ClockKit-watchOS-xcode10-GM

``` diff
--- /Applications/Xcode10-beta6.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ClockKit.framework/Headers/CLKDefines.h	2018-08-10 17:39:53.000000000 -0400
+++ /Applications/Xcode10GM.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ClockKit.framework/Headers/CLKDefines.h	2018-08-29 05:55:06.000000000 -0400
@@ -19,6 +19,10 @@
     CLKComplicationFamilyCircularSmall                                                        = 4,
     CLKComplicationFamilyExtraLarge CLK_AVAILABLE_WATCHOS_IOS(3_0, 10_0)                      = 7,
     
+    CLKComplicationFamilyGraphicCorner CLK_AVAILABLE_WATCHOS_IOS(5_0, 12_0)                 = 8,
+    CLKComplicationFamilyGraphicBezel CLK_AVAILABLE_WATCHOS_IOS(5_0, 12_0)                  = 9,
+    CLKComplicationFamilyGraphicCircular CLK_AVAILABLE_WATCHOS_IOS(5_0, 12_0)               = 10,
+    CLKComplicationFamilyGraphicRectangular CLK_AVAILABLE_WATCHOS_IOS(5_0, 12_0)            = 11,
 };
```

These are important enum values related to the new "graphic" complications types.
Copy link
Contributor

@spouliot spouliot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor: ordering is automatic, you do not need them unless they are not continuous

@monojenkins
Copy link
Collaborator

Build failure
Build was aborted

@monojenkins
Copy link
Collaborator

Build failure
Build succeeded
API Diff (from stable)
API Diff (from PR only) (please review changes)
Generator Diff (only version changes)
🔥 Test run failed 🔥

Test results

1 tests failed, 0 tests skipped, 79 tests passed.

Failed tests

  • link all/Mac/Debug: Failed (Test run failed.)

@VincentDondain
Copy link
Contributor Author

Known test failure: https://github.com/xamarin/maccore/issues/649

@VincentDondain VincentDondain merged commit a4268f2 into xcode10 Sep 14, 2018
@VincentDondain VincentDondain deleted the xcode10-clockkit-gm-missing-enum-values branch September 14, 2018 22:45
@t9mike
Copy link

t9mike commented Sep 21, 2018

Rookie question: when will this update be in one of the release channels? I need new watchOS 5 complications.

@t9mike
Copy link

t9mike commented Sep 21, 2018

Rookie question: when will this update be in one of the release channels? I need new watchOS 5 complications.

So Xcode Preview 10 channel is behind stable now. OK, I see it new watchOS types now that I switched to Stable.

Would be really helpful if a modal dialog warning was shown on VS.NET Mac launch or if manually check for new version if channel you are on is BEHIND a "higher" channel.

@t9mike
Copy link

t9mike commented Sep 21, 2018

Would be really helpful if a modal dialog warning was shown on VS.NET Mac launch or if manually check for new version if channel you are on is BEHIND a "higher" channel.

See https://developercommunity.visualstudio.com/content/problem/340745/check-for-updates-needs-to-provide-status-of-behin.html and https://developercommunity.visualstudio.com/content/problem/340746/proactively-warn-user-if-they-are-on-update-channe.html.

@VincentDondain
Copy link
Contributor Author

Hi @t9mike sorry for not answering earlier I totally missed your responses. My bad I apologize.

Thanks for filing those issues against Visual Studio for Mac, your feedback seems valid to me, the team will investigate.

Also it's a bit late now because you have the new enum values but in the future if we're ever missing enum values (we shouldn't!) know that you can just use the new values directly.

So in an if statement in GetCurrentTimelineEntry for instance: complication.Family == CLKComplicationFamily.GraphicCorner is equivalent to complication.Family == (CLKComplicationFamily)8 (;

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants