From 4eae13e5d643406d9e61ec3b8faf7e78c52ff1f9 Mon Sep 17 00:00:00 2001 From: Rachel Kang Date: Fri, 25 Jun 2021 17:05:42 -0400 Subject: [PATCH 1/2] [Accounts] Update bindings for Xcode 13.0 beta 1 --- src/accounts.cs | 16 ++++++++++++++++ src/social.cs | 4 ++++ src/twitter.cs | 7 ++++++- tests/xtro-sharpie/iOS-Accounts.todo | 4 ---- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/accounts.cs b/src/accounts.cs index 36a4af6cf42e..c394dce73481 100644 --- a/src/accounts.cs +++ b/src/accounts.cs @@ -8,6 +8,10 @@ namespace Accounts { + [Introduced (PlatformName.iOS, 6, 0, message: "Use the non-Apple SDK relating to your account type instead.")] + [Deprecated (PlatformName.iOS, 15, 0, message: "Use the non-Apple SDK relating to your account type instead.")] + [Introduced (PlatformName.MacOSX, 10, 8, message: "Use the non-Apple SDK relating to your account type instead.")] + [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use the non-Apple SDK relating to your account type instead.")] [BaseType (typeof (NSObject))] interface ACAccount : NSSecureCoding { [Export ("identifier", ArgumentSemantic.Weak)] @@ -44,6 +48,10 @@ interface ACAccount : NSSecureCoding { string UserFullName { get; } } + [Introduced (PlatformName.iOS, 6, 0, message: "Use the non-Apple SDK relating to your account type instead.")] + [Deprecated (PlatformName.iOS, 15, 0, message: "Use the non-Apple SDK relating to your account type instead.")] + [Introduced (PlatformName.MacOSX, 10, 8, message: "Use the non-Apple SDK relating to your account type instead.")] + [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use the non-Apple SDK relating to your account type instead.")] [BaseType (typeof (NSObject))] interface ACAccountCredential : NSSecureCoding { [Export ("initWithOAuthToken:tokenSecret:")] @@ -61,6 +69,10 @@ interface ACAccountCredential : NSSecureCoding { delegate void ACAccountStoreRemoveCompletionHandler (bool success, NSError error); delegate void ACRequestCompletionHandler (bool granted, NSError error); + [Introduced (PlatformName.iOS, 6, 0, message: "Use the non-Apple SDK relating to your account type instead.")] + [Deprecated (PlatformName.iOS, 15, 0, message: "Use the non-Apple SDK relating to your account type instead.")] + [Introduced (PlatformName.MacOSX, 10, 8, message: "Use the non-Apple SDK relating to your account type instead.")] + [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use the non-Apple SDK relating to your account type instead.")] [BaseType (typeof (NSObject))] interface ACAccountStore { [Export ("accounts", ArgumentSemantic.Weak)] @@ -111,6 +123,10 @@ interface ACAccountStore { void RemoveAccount (ACAccount account, ACAccountStoreRemoveCompletionHandler completionHandler); } + [Introduced (PlatformName.iOS, 6, 0, message: "Use the non-Apple SDK relating to your account type instead.")] + [Deprecated (PlatformName.iOS, 15, 0, message: "Use the non-Apple SDK relating to your account type instead.")] + [Introduced (PlatformName.MacOSX, 10, 8, message: "Use the non-Apple SDK relating to your account type instead.")] + [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use the non-Apple SDK relating to your account type instead.")] [BaseType (typeof (NSObject))] interface ACAccountType : NSSecureCoding { [Export ("accountTypeDescription")] diff --git a/src/social.cs b/src/social.cs index 920efdaf90e2..d85e159bb50d 100644 --- a/src/social.cs +++ b/src/social.cs @@ -60,6 +60,10 @@ interface SLRequest { [Export ("requestForServiceType:requestMethod:URL:parameters:")] SLRequest Create (NSString serviceType, SLRequestMethod requestMethod, NSUrl url, [NullAllowed] NSDictionary parameters); + [Introduced (PlatformName.iOS, 6, 0, message: "Use the non-Apple SDK relating to your account type instead.")] + [Deprecated (PlatformName.iOS, 15, 0, message: "Use the non-Apple SDK relating to your account type instead.")] + [Introduced (PlatformName.MacOSX, 10, 8, message: "Use the non-Apple SDK relating to your account type instead.")] + [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use the non-Apple SDK relating to your account type instead.")] [Export ("account", ArgumentSemantic.Retain), NullAllowed] ACAccount Account { get; set; } diff --git a/src/twitter.cs b/src/twitter.cs index cddecbde6bd5..13d2b372c96e 100644 --- a/src/twitter.cs +++ b/src/twitter.cs @@ -19,6 +19,11 @@ namespace Twitter { [Availability (Deprecated = Platform.iOS_6_0, Message = "Use the 'Social' framework.")] [BaseType (typeof (NSObject))] interface TWRequest { + + [Introduced (PlatformName.iOS, 6, 0, message: "Use the non-Apple SDK relating to your account type instead.")] + [Deprecated (PlatformName.iOS, 15, 0, message: "Use the non-Apple SDK relating to your account type instead.")] + [Introduced (PlatformName.MacOSX, 10, 8, message: "Use the non-Apple SDK relating to your account type instead.")] + [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use the non-Apple SDK relating to your account type instead.")] [NullAllowed] // by default this property is null [Export ("account")] ACAccount Account { get; set; } @@ -76,4 +81,4 @@ interface TWTweetComposeViewController { bool RemoveAllUrls (); } -} \ No newline at end of file +} diff --git a/tests/xtro-sharpie/iOS-Accounts.todo b/tests/xtro-sharpie/iOS-Accounts.todo index fd66e6a93a3d..e69de29bb2d1 100644 --- a/tests/xtro-sharpie/iOS-Accounts.todo +++ b/tests/xtro-sharpie/iOS-Accounts.todo @@ -1,4 +0,0 @@ -!deprecated-attribute-missing! ACAccount missing a [Deprecated] attribute -!deprecated-attribute-missing! ACAccountCredential missing a [Deprecated] attribute -!deprecated-attribute-missing! ACAccountStore missing a [Deprecated] attribute -!deprecated-attribute-missing! ACAccountType missing a [Deprecated] attribute From d5a293a7042d2b67594a539b647c1d65d3fab78c Mon Sep 17 00:00:00 2001 From: Rachel Kang Date: Wed, 30 Jun 2021 10:51:56 -0400 Subject: [PATCH 2/2] Remove unnecessary availability tags --- src/accounts.cs | 8 -------- src/social.cs | 2 -- src/twitter.cs | 4 ---- 3 files changed, 14 deletions(-) diff --git a/src/accounts.cs b/src/accounts.cs index c394dce73481..2c2330ed48d6 100644 --- a/src/accounts.cs +++ b/src/accounts.cs @@ -8,9 +8,7 @@ namespace Accounts { - [Introduced (PlatformName.iOS, 6, 0, message: "Use the non-Apple SDK relating to your account type instead.")] [Deprecated (PlatformName.iOS, 15, 0, message: "Use the non-Apple SDK relating to your account type instead.")] - [Introduced (PlatformName.MacOSX, 10, 8, message: "Use the non-Apple SDK relating to your account type instead.")] [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use the non-Apple SDK relating to your account type instead.")] [BaseType (typeof (NSObject))] interface ACAccount : NSSecureCoding { @@ -48,9 +46,7 @@ interface ACAccount : NSSecureCoding { string UserFullName { get; } } - [Introduced (PlatformName.iOS, 6, 0, message: "Use the non-Apple SDK relating to your account type instead.")] [Deprecated (PlatformName.iOS, 15, 0, message: "Use the non-Apple SDK relating to your account type instead.")] - [Introduced (PlatformName.MacOSX, 10, 8, message: "Use the non-Apple SDK relating to your account type instead.")] [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use the non-Apple SDK relating to your account type instead.")] [BaseType (typeof (NSObject))] interface ACAccountCredential : NSSecureCoding { @@ -69,9 +65,7 @@ interface ACAccountCredential : NSSecureCoding { delegate void ACAccountStoreRemoveCompletionHandler (bool success, NSError error); delegate void ACRequestCompletionHandler (bool granted, NSError error); - [Introduced (PlatformName.iOS, 6, 0, message: "Use the non-Apple SDK relating to your account type instead.")] [Deprecated (PlatformName.iOS, 15, 0, message: "Use the non-Apple SDK relating to your account type instead.")] - [Introduced (PlatformName.MacOSX, 10, 8, message: "Use the non-Apple SDK relating to your account type instead.")] [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use the non-Apple SDK relating to your account type instead.")] [BaseType (typeof (NSObject))] interface ACAccountStore { @@ -123,9 +117,7 @@ interface ACAccountStore { void RemoveAccount (ACAccount account, ACAccountStoreRemoveCompletionHandler completionHandler); } - [Introduced (PlatformName.iOS, 6, 0, message: "Use the non-Apple SDK relating to your account type instead.")] [Deprecated (PlatformName.iOS, 15, 0, message: "Use the non-Apple SDK relating to your account type instead.")] - [Introduced (PlatformName.MacOSX, 10, 8, message: "Use the non-Apple SDK relating to your account type instead.")] [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use the non-Apple SDK relating to your account type instead.")] [BaseType (typeof (NSObject))] interface ACAccountType : NSSecureCoding { diff --git a/src/social.cs b/src/social.cs index d85e159bb50d..25d6f93c2039 100644 --- a/src/social.cs +++ b/src/social.cs @@ -60,9 +60,7 @@ interface SLRequest { [Export ("requestForServiceType:requestMethod:URL:parameters:")] SLRequest Create (NSString serviceType, SLRequestMethod requestMethod, NSUrl url, [NullAllowed] NSDictionary parameters); - [Introduced (PlatformName.iOS, 6, 0, message: "Use the non-Apple SDK relating to your account type instead.")] [Deprecated (PlatformName.iOS, 15, 0, message: "Use the non-Apple SDK relating to your account type instead.")] - [Introduced (PlatformName.MacOSX, 10, 8, message: "Use the non-Apple SDK relating to your account type instead.")] [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use the non-Apple SDK relating to your account type instead.")] [Export ("account", ArgumentSemantic.Retain), NullAllowed] ACAccount Account { get; set; } diff --git a/src/twitter.cs b/src/twitter.cs index 13d2b372c96e..4ea6c480508a 100644 --- a/src/twitter.cs +++ b/src/twitter.cs @@ -20,10 +20,6 @@ namespace Twitter { [BaseType (typeof (NSObject))] interface TWRequest { - [Introduced (PlatformName.iOS, 6, 0, message: "Use the non-Apple SDK relating to your account type instead.")] - [Deprecated (PlatformName.iOS, 15, 0, message: "Use the non-Apple SDK relating to your account type instead.")] - [Introduced (PlatformName.MacOSX, 10, 8, message: "Use the non-Apple SDK relating to your account type instead.")] - [Deprecated (PlatformName.MacOSX, 12, 0, message: "Use the non-Apple SDK relating to your account type instead.")] [NullAllowed] // by default this property is null [Export ("account")] ACAccount Account { get; set; }