Skip to content

Commit

Permalink
Merge branch 'master' into JEP181/nestbased_access_control
Browse files Browse the repository at this point in the history
  • Loading branch information
@dkimitsa
dkimitsa authored Aug 30, 2022
2 parents cee117f + 02f50b1 commit 3d8ba40
Show file tree
Hide file tree
Showing 84 changed files with 355 additions and 242 deletions.
2 changes: 1 addition & 1 deletion compiler/cocoatouch/src/main/java/org/robovm/apple/accounts/ACAccountStore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static class Notifications {
/**
* @since Available in iOS 5.0 and later.
*/
public NSObjectProtocol observeDidChange(final Runnable block) {
public NSObject observeDidChange(final Runnable block) {
return NSNotificationCenter.getDefaultCenter().addObserver(DidChangeNotification(), null, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/cocoatouch/src/main/java/org/robovm/apple/assetslibrary/ALAssetsLibrary.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
/*<implements>*//*</implements>*/ {

public static class Notifications {
public static NSObjectProtocol observeChanged(ALAssetsLibrary object, final VoidBlock2<ALAssetsLibrary, ALAssetsLibraryChangedNotification> block) {
public static NSObject observeChanged(ALAssetsLibrary object, final VoidBlock2<ALAssetsLibrary, ALAssetsLibraryChangedNotification> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(ChangedNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/cocoatouch/src/main/java/org/robovm/apple/audiotoolbox/AudioComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static class Notifications {
/**
* @since Available in iOS 7.0 and later.
*/
public static NSObjectProtocol observeRegistrationsChanged(final Runnable block) {
public static NSObject observeRegistrationsChanged(final Runnable block) {
return NSNotificationCenter.getDefaultCenter().addObserver(RegistrationsChangedNotification(), null, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand Down
6 changes: 3 additions & 3 deletions compiler/cocoatouch/src/main/java/org/robovm/apple/avfoundation/AVAsset.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static class Notifications {
/**
* @since Available in iOS 9.0 and later.
*/
public static NSObjectProtocol observeDurationDidChange(AVAsset object, final VoidBlock1<AVAsset> block) {
public static NSObject observeDurationDidChange(AVAsset object, final VoidBlock1<AVAsset> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(DurationDidChangeNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification notification) {
Expand All @@ -63,7 +63,7 @@ public void invoke(NSNotification notification) {
/**
* @since Available in iOS 9.0 and later.
*/
public static NSObjectProtocol observeChapterMetadataGroupsDidChange(AVAsset object, final VoidBlock1<AVAsset> block) {
public static NSObject observeChapterMetadataGroupsDidChange(AVAsset object, final VoidBlock1<AVAsset> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(ChapterMetadataGroupsDidChangeNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification notification) {
Expand All @@ -74,7 +74,7 @@ public void invoke(NSNotification notification) {
/**
* @since Available in iOS 9.0 and later.
*/
public static NSObjectProtocol observeMediaSelectionGroupsDidChange(AVAsset object, final VoidBlock1<AVAsset> block) {
public static NSObject observeMediaSelectionGroupsDidChange(AVAsset object, final VoidBlock1<AVAsset> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(MediaSelectionGroupsDidChangeNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification notification) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/cocoatouch/src/main/java/org/robovm/apple/avfoundation/AVAssetTrack.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static class Notifications {
/**
* @since Available in iOS 9.0 and later.
*/
public static NSObjectProtocol observeTrackAssociationsDidChange(AVAssetTrack object, final VoidBlock1<AVAssetTrack> block) {
public static NSObject observeTrackAssociationsDidChange(AVAssetTrack object, final VoidBlock1<AVAssetTrack> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(TrackAssociationsDidChangeNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification notification) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/cocoatouch/src/main/java/org/robovm/apple/avfoundation/AVAudioEngine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static class Notifications {
/**
* @since Available in iOS 8.0 and later.
*/
public static NSObjectProtocol observeConfigurationChange(AVAudioEngine object, final VoidBlock1<AVAudioEngine> block) {
public static NSObject observeConfigurationChange(AVAudioEngine object, final VoidBlock1<AVAudioEngine> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(ConfigurationChangeNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand Down
10 changes: 5 additions & 5 deletions compiler/cocoatouch/src/main/java/org/robovm/apple/avfoundation/AVAudioSession.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static class Notifications {
/**
* @since Available in iOS 6.0 and later.
*/
public static NSObjectProtocol observeInterruption(final VoidBlock1<AVAudioSessionInterruptionNotification> block) {
public static NSObject observeInterruption(final VoidBlock1<AVAudioSessionInterruptionNotification> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(InterruptionNotification(), null, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand All @@ -69,7 +69,7 @@ public void invoke(NSNotification a) {
/**
* @since Available in iOS 6.0 and later.
*/
public static NSObjectProtocol observeRouteChange(final VoidBlock1<AVAudioSessionRouteChangeNotification> block) {
public static NSObject observeRouteChange(final VoidBlock1<AVAudioSessionRouteChangeNotification> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(RouteChangeNotification(), null, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand All @@ -85,7 +85,7 @@ public void invoke(NSNotification a) {
/**
* @since Available in iOS 7.0 and later.
*/
public static NSObjectProtocol observeMediaServicesWereLost(final Runnable block) {
public static NSObject observeMediaServicesWereLost(final Runnable block) {
return NSNotificationCenter.getDefaultCenter().addObserver(MediaServicesWereLostNotification(), null, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand All @@ -96,7 +96,7 @@ public void invoke(NSNotification a) {
/**
* @since Available in iOS 6.0 and later.
*/
public static NSObjectProtocol observeMediaServicesWereReset(final Runnable block) {
public static NSObject observeMediaServicesWereReset(final Runnable block) {
return NSNotificationCenter.getDefaultCenter().addObserver(MediaServicesWereResetNotification(), null, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand All @@ -107,7 +107,7 @@ public void invoke(NSNotification a) {
/**
* @since Available in iOS 8.0 and later.
*/
public static NSObjectProtocol observeSilenceSecondaryAudioHint(final VoidBlock1<AVAudioSessionSilenceSecondaryAudioHintType> block) {
public static NSObject observeSilenceSecondaryAudioHint(final VoidBlock1<AVAudioSessionSilenceSecondaryAudioHintType> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(SilenceSecondaryAudioHintNotification(), null, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/cocoatouch/src/main/java/org/robovm/apple/avfoundation/AVAudioUnitComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public static class Notifications {
/**
* @since Available in iOS 9.0 and later.
*/
public static NSObjectProtocol observeTagsDidChange(AVAudioUnitComponent object, final VoidBlock1<AVAudioUnitComponent> block) {
public static NSObject observeTagsDidChange(AVAudioUnitComponent object, final VoidBlock1<AVAudioUnitComponent> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(TagsDidChangeNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification notification) {
Expand Down
6 changes: 3 additions & 3 deletions compiler/cocoatouch/src/main/java/org/robovm/apple/avfoundation/AVCaptureDevice.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static class Notifications {
/**
* @since Available in iOS 4.0 and later.
*/
public static NSObjectProtocol observeWasConnected(final VoidBlock1<AVCaptureDevice> block) {
public static NSObject observeWasConnected(final VoidBlock1<AVCaptureDevice> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(WasConnectedNotification(), null, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand All @@ -63,7 +63,7 @@ public void invoke(NSNotification a) {
/**
* @since Available in iOS 4.0 and later.
*/
public static NSObjectProtocol observeWasDisconnected(final VoidBlock1<AVCaptureDevice> block) {
public static NSObject observeWasDisconnected(final VoidBlock1<AVCaptureDevice> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(WasDisconnectedNotification(), null, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand All @@ -74,7 +74,7 @@ public void invoke(NSNotification a) {
/**
* @since Available in iOS 5.0 and later.
*/
public static NSObjectProtocol observeSubjectAreaDidChange(AVCaptureDevice object, final VoidBlock1<AVCaptureDevice> block) {
public static NSObject observeSubjectAreaDidChange(AVCaptureDevice object, final VoidBlock1<AVCaptureDevice> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(SubjectAreaDidChangeNotification(), null, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/cocoatouch/src/main/java/org/robovm/apple/avfoundation/AVCaptureInputPort.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static class Notifications {
/**
* @since Available in iOS 4.0 and later.
*/
public static NSObjectProtocol observeFormatDescriptionDidChange(AVCaptureInputPort object, final VoidBlock1<AVCaptureInputPort> block) {
public static NSObject observeFormatDescriptionDidChange(AVCaptureInputPort object, final VoidBlock1<AVCaptureInputPort> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(FormatDescriptionDidChangeNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand Down
10 changes: 5 additions & 5 deletions compiler/cocoatouch/src/main/java/org/robovm/apple/avfoundation/AVCaptureSession.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static class Notifications {
/**
* @since Available in iOS 4.0 and later.
*/
public static NSObjectProtocol observeRuntimeError(AVCaptureSession object, final VoidBlock2<AVCaptureSession, NSError> block) {
public static NSObject observeRuntimeError(AVCaptureSession object, final VoidBlock2<AVCaptureSession, NSError> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(RuntimeErrorNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand All @@ -68,7 +68,7 @@ public void invoke(NSNotification a) {
/**
* @since Available in iOS 4.0 and later.
*/
public static NSObjectProtocol observeDidStartRunning(AVCaptureSession object, final VoidBlock1<AVCaptureSession> block) {
public static NSObject observeDidStartRunning(AVCaptureSession object, final VoidBlock1<AVCaptureSession> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(DidStartRunningNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand All @@ -79,7 +79,7 @@ public void invoke(NSNotification a) {
/**
* @since Available in iOS 4.0 and later.
*/
public static NSObjectProtocol observeDidStopRunning(AVCaptureSession object, final VoidBlock1<AVCaptureSession> block) {
public static NSObject observeDidStopRunning(AVCaptureSession object, final VoidBlock1<AVCaptureSession> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(DidStopRunningNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand All @@ -90,7 +90,7 @@ public void invoke(NSNotification a) {
/**
* @since Available in iOS 4.0 and later.
*/
public static NSObjectProtocol observeWasInterrupted(AVCaptureSession object, final VoidBlock2<AVCaptureSession, AVCaptureSessionInterruptionReason> block) {
public static NSObject observeWasInterrupted(AVCaptureSession object, final VoidBlock2<AVCaptureSession, AVCaptureSessionInterruptionReason> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(WasInterruptedNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification notification) {
Expand All @@ -109,7 +109,7 @@ public void invoke(NSNotification notification) {
/**
* @since Available in iOS 4.0 and later.
*/
public static NSObjectProtocol observeInterruptionEnded(AVCaptureSession object, final VoidBlock1<AVCaptureSession> block) {
public static NSObject observeInterruptionEnded(AVCaptureSession object, final VoidBlock1<AVCaptureSession> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(InterruptionEndedNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand Down
12 changes: 6 additions & 6 deletions compiler/cocoatouch/src/main/java/org/robovm/apple/avfoundation/AVPlayerItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static class Notifications {
/**
* @since Available in iOS 5.0 and later.
*/
public static NSObjectProtocol observeTimeJumped(AVPlayerItem object, final VoidBlock1<AVPlayerItem> block) {
public static NSObject observeTimeJumped(AVPlayerItem object, final VoidBlock1<AVPlayerItem> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(TimeJumpedNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification notification) {
Expand All @@ -63,7 +63,7 @@ public void invoke(NSNotification notification) {
/**
* @since Available in iOS 4.0 and later.
*/
public static NSObjectProtocol observeDidPlayToEndTime(AVPlayerItem object, final VoidBlock1<AVPlayerItem> block) {
public static NSObject observeDidPlayToEndTime(AVPlayerItem object, final VoidBlock1<AVPlayerItem> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(DidPlayToEndTimeNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification notification) {
Expand All @@ -74,7 +74,7 @@ public void invoke(NSNotification notification) {
/**
* @since Available in iOS 4.3 and later.
*/
public static NSObjectProtocol observeFailedToPlayToEndTime(AVPlayerItem object, final VoidBlock2<AVPlayerItem, NSError> block) {
public static NSObject observeFailedToPlayToEndTime(AVPlayerItem object, final VoidBlock2<AVPlayerItem, NSError> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(FailedToPlayToEndTimeNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification notification) {
Expand All @@ -90,7 +90,7 @@ public void invoke(NSNotification notification) {
/**
* @since Available in iOS 6.0 and later.
*/
public static NSObjectProtocol observePlaybackStalled(AVPlayerItem object, final VoidBlock1<AVPlayerItem> block) {
public static NSObject observePlaybackStalled(AVPlayerItem object, final VoidBlock1<AVPlayerItem> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(PlaybackStalledNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification notification) {
Expand All @@ -101,7 +101,7 @@ public void invoke(NSNotification notification) {
/**
* @since Available in iOS 6.0 and later.
*/
public static NSObjectProtocol observeNewAccessLogEntry(AVPlayerItem object, final VoidBlock1<AVPlayerItem> block) {
public static NSObject observeNewAccessLogEntry(AVPlayerItem object, final VoidBlock1<AVPlayerItem> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(NewAccessLogEntryNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification notification) {
Expand All @@ -112,7 +112,7 @@ public void invoke(NSNotification notification) {
/**
* @since Available in iOS 6.0 and later.
*/
public static NSObjectProtocol observeNewErrorLogEntry(AVPlayerItem object, final VoidBlock1<AVPlayerItem> block) {
public static NSObject observeNewErrorLogEntry(AVPlayerItem object, final VoidBlock1<AVPlayerItem> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(NewErrorLogEntryNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification notification) {
Expand Down
2 changes: 1 addition & 1 deletion ...er/cocoatouch/src/main/java/org/robovm/apple/avfoundation/AVSampleBufferDisplayLayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static class Notifications {
/**
* @since Available in iOS 8.0 and later.
*/
public static NSObjectProtocol observeFailedToDecode(AVSampleBufferDisplayLayer object, final VoidBlock2<AVSampleBufferDisplayLayer, NSError> block) {
public static NSObject observeFailedToDecode(AVSampleBufferDisplayLayer object, final VoidBlock2<AVSampleBufferDisplayLayer, NSError> block) {
return NSNotificationCenter.getDefaultCenter().addObserver(FailedToDecodeNotification(), object, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/cocoatouch/src/main/java/org/robovm/apple/cloudkit/CKContainer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static class Notifications {
/**
* @since Available in iOS 9.0 and later.
*/
public static NSObjectProtocol observeAccountChanged(final Runnable block) {
public static NSObject observeAccountChanged(final Runnable block) {
return NSNotificationCenter.getDefaultCenter().addObserver(AccountChangedNotification(), null, NSOperationQueue.getMainQueue(), new VoidBlock1<NSNotification>() {
@Override
public void invoke(NSNotification a) {
Expand Down
Loading

0 comments on commit 3d8ba40

Please sign in to comment.