Skip to content

Commit

Permalink
[CoreHaptics] Add support for Xcode 14 beta 1,2, & 3 (#15523)
Browse files Browse the repository at this point in the history
Co-authored-by: Alex Soto <alex@alexsoto.me>
  • Loading branch information
mandel-macaque and dalexsoto authored Jul 18, 2022
1 parent 368b818 commit 28541dc
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 30 deletions.
21 changes: 21 additions & 0 deletions src/corehaptics.cs
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ interface CHHapticAdvancedPatternPlayer : CHHapticPatternPlayer {
[DisableDefaultCtor]
interface CHHapticEngine
{

[Static]
[Export ("capabilitiesForHardware")]
ICHHapticDeviceCapability GetHardwareCapabilities ();
Expand Down Expand Up @@ -309,6 +310,10 @@ interface CHHapticEngine

[Export ("playPatternFromData:error:")]
bool PlayPattern (NSData data, [NullAllowed] out NSError outError);

[TV (16,0), NoWatch, MacCatalyst (16,0), Mac (13,0), iOS (16,0)]
[Export ("playsAudioOnly")]
bool PlaysAudioOnly { get; set; }
}

[Static]
Expand Down Expand Up @@ -357,6 +362,10 @@ partial interface CHHapticPatternDefinitionKeys {
[TV (15,0), NoWatch, Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
[Field ("CHHapticPatternKeyEventWaveformUseVolumeEnvelope")]
NSString EventWaveformUseVolumeEnvelopeKey { get; }

[TV (16,0), NoWatch, MacCatalyst (16,0), Mac (13,0), iOS (16,0)]
[Field ("CHHapticPatternKeyEventWaveformLoopEnabled")]
NSString EventWaveformLoopEnabledKey { get; }
}

[Mac (10,15), iOS (13,0), TV (14, 0)]
Expand Down Expand Up @@ -405,6 +414,10 @@ interface CHHapticPattern {
[Wrap ("this (patternDefinition.GetDictionary ()!, out outError)")]
NativeHandle Constructor (CHHapticPatternDefinition patternDefinition, [NullAllowed] out NSError outError);

[TV (16,0), NoWatch, MacCatalyst (16,0), Mac (13,0), iOS (16,0)]
[Export ("initWithContentsOfURL:error:")]
NativeHandle Constructor (NSUrl url, [NullAllowed] out NSError error);

[Internal]
[Export ("exportDictionaryAndReturnError:")]
[return: NullAllowed]
Expand All @@ -421,13 +434,21 @@ interface CHHapticPattern {
partial interface CHHapticAudioResourceKeys {
[Field ("CHHapticAudioResourceKeyUseVolumeEnvelope")]
NSString UseVolumeEnvelopeKey { get; }

[TV (16,0), NoWatch, MacCatalyst (16, 0), Mac (13,0), iOS (16, 0)]
[Field ("CHHapticAudioResourceKeyLoopEnabled")]
NSString LoopEnabledKey { get; }

}

[Mac (12,0), iOS (15,0), TV (15,0), MacCatalyst (15,0), NoWatch]
[StrongDictionary ("CHHapticAudioResourceKeys")]
partial interface CHHapticAudioResourceDefinition {
[Advice ("The default value is true.")]
bool UseVolumeEnvelope { get; set; }

[Advice ("The default value is false.")]
bool LoopEnabled { get; set; }
}

}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,8 @@
!missing-type! CHHapticPattern not bound
!missing-field! CHHapticAudioResourceKeyUseVolumeEnvelope not bound
!missing-field! CHHapticPatternKeyEventWaveformUseVolumeEnvelope not bound
!missing-field! CHHapticAudioResourceKeyLoopEnabled not bound
!missing-field! CHHapticPatternKeyEventWaveformLoopEnabled not bound
!missing-selector! CHHapticEngine::playsAudioOnly not bound
!missing-selector! CHHapticEngine::setPlaysAudioOnly: not bound
!missing-selector! CHHapticPattern::initWithContentsOfURL:error: not bound

This file was deleted.

This file was deleted.

5 changes: 0 additions & 5 deletions tests/xtro-sharpie/iOS-CoreHaptics.todo

This file was deleted.

5 changes: 5 additions & 0 deletions tests/xtro-sharpie/macOS-CoreHaptics.ignore
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,8 @@
!missing-type! CHHapticPattern not bound
!missing-field! CHHapticAudioResourceKeyUseVolumeEnvelope not bound
!missing-field! CHHapticPatternKeyEventWaveformUseVolumeEnvelope not bound
!missing-field! CHHapticAudioResourceKeyLoopEnabled not bound
!missing-field! CHHapticPatternKeyEventWaveformLoopEnabled not bound
!missing-selector! CHHapticEngine::playsAudioOnly not bound
!missing-selector! CHHapticEngine::setPlaysAudioOnly: not bound
!missing-selector! CHHapticPattern::initWithContentsOfURL:error: not bound
5 changes: 0 additions & 5 deletions tests/xtro-sharpie/macOS-CoreHaptics.todo

This file was deleted.

5 changes: 0 additions & 5 deletions tests/xtro-sharpie/tvOS-CoreHaptics.todo

This file was deleted.

5 comments on commit 28541dc

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

💻 [CI Build] Tests on macOS Mac Catalina (10.15) passed 💻

All tests on macOS Mac Catalina (10.15) passed.

Pipeline on Agent
Hash: 28541dc88f5d09fe29aa303ff968edb3d627f983 [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

✅ API diff for current PR / commit

Legacy Xamarin (No breaking changes)
  • iOS: vsdrops gist (No breaking changes)
  • tvOS: vsdrops gist (No breaking changes)
  • watchOS (no change detected)
  • macOS (no change detected)
.NET (No breaking changes)

❗ API diff vs stable (Breaking changes)

Legacy Xamarin (:heavy_exclamation_mark: Breaking changes :heavy_exclamation_mark:)
  • iOS: vsdrops gist (:heavy_exclamation_mark: Breaking changes :heavy_exclamation_mark:)
  • tvOS: vsdrops gist (:heavy_exclamation_mark: Breaking changes :heavy_exclamation_mark:)
  • watchOS: vsdrops gist (:heavy_exclamation_mark: Breaking changes :heavy_exclamation_mark:)
  • macOS: vsdrops gist (:heavy_exclamation_mark: Breaking changes :heavy_exclamation_mark:)
.NET (:heavy_exclamation_mark: Breaking changes :heavy_exclamation_mark:)
  • iOS: vsdrops gist (:heavy_exclamation_mark: Breaking changes :heavy_exclamation_mark:)
  • tvOS: vsdrops gist (:heavy_exclamation_mark: Breaking changes :heavy_exclamation_mark:)
  • MacCatalyst: vsdrops gist (:heavy_exclamation_mark: Breaking changes :heavy_exclamation_mark:)
  • macOS: vsdrops gist (:heavy_exclamation_mark: Breaking changes :heavy_exclamation_mark:)
  • Microsoft.iOS vs Microsoft.MacCatalyst: vsdrops gist
Legacy Xamarin (stable) vs .NET

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: 28541dc88f5d09fe29aa303ff968edb3d627f983 [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

❌ [CI Build] Tests on macOS M1 - Mac Big Sur (11.5) failed ❌

Failed tests are:

  • monotouch-test

Pipeline on Agent
Hash: 28541dc88f5d09fe29aa303ff968edb3d627f983 [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

📚 [CI Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent XAMMINI-062.Monterey'
Hash: 28541dc88f5d09fe29aa303ff968edb3d627f983 [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

🔥 [CI Build] Test results 🔥

Test results

❌ Tests failed on VSTS: simulator tests

0 tests crashed, 3 tests failed, 225 tests passed.

Failures

❌ introspection tests

3 tests failed, 10 tests passed.
  • introspection/iOS Unified 64-bits - simulator/Debug (iOS 12.4) [dotnet]: TimedOut
  • introspection/iOS Unified 64-bits - simulator/Debug (iOS 12.4): TimedOut
  • introspection/watchOS 32-bits - simulator/Debug (watchOS 6.0): Crashed Known issue: HE0038)

Html Report (VSDrops) Download

Successes

✅ bcl: All 69 tests passed. Html Report (VSDrops) Download
✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests: All 1 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 7 tests passed. Html Report (VSDrops) Download
✅ framework: All 8 tests passed. Html Report (VSDrops) Download
✅ generator: All 2 tests passed. Html Report (VSDrops) Download
✅ interdependent_binding_projects: All 7 tests passed. Html Report (VSDrops) Download
✅ install_source: All 1 tests passed. Html Report (VSDrops) Download
✅ linker: All 65 tests passed. Html Report (VSDrops) Download
✅ mac_binding_project: All 1 tests passed. Html Report (VSDrops) Download
✅ mmp: All 2 tests passed. Html Report (VSDrops) Download
✅ mononative: All 12 tests passed. Html Report (VSDrops) Download
✅ monotouch: All 23 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ mtouch: All 1 tests passed. Html Report (VSDrops) Download
✅ xammac: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 8 tests passed. Html Report (VSDrops) Download
✅ xtro: All 2 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: [CI build]

Please sign in to comment.