Removing deprecation messages in MTR code

src/darwin/Framework/CHIP/MTRDeviceController.h

@@ -73,8 +73,6 @@ typedef void (^MTRDeviceConnectionCallback)(MTRBaseDevice * _Nullable device, NS
     API_AVAILABLE(ios(16.2), macos(13.1), watchos(9.2), tvos(16.2));
 
 /**
- * @deprecated - Use the setupCommissioningSessionWithPayload API to pair devices
- *
  * Start pairing for a device with the given ID, using the provided setup PIN
  * to establish a PASE connection.
  *
@@ -89,11 +87,9 @@ typedef void (^MTRDeviceConnectionCallback)(MTRBaseDevice * _Nullable device, NS
 - (BOOL)pairDevice:(uint64_t)deviceID
      discriminator:(uint16_t)discriminator
       setupPINCode:(uint32_t)setupPINCode
-             error:(NSError * __autoreleasing *)error DEPRECATED_MSG_ATTRIBUTE("Use setupCommissioningSessionWithPayload method.");
+             error:(NSError * __autoreleasing *)error;
 
 /**
- * @deprecated - Use the setupCommissioningSessionWithPayload API to pair devices
- *
  * Start pairing for a device with the given ID, using the provided IP address
  * and port to connect to the device and the provided setup PIN to establish a
  * PASE connection.
@@ -107,11 +103,9 @@ typedef void (^MTRDeviceConnectionCallback)(MTRBaseDevice * _Nullable device, NS
            address:(NSString *)address
               port:(uint16_t)port
       setupPINCode:(uint32_t)setupPINCode
-             error:(NSError * __autoreleasing *)error DEPRECATED_MSG_ATTRIBUTE("Use setupCommissioningSessionWithPayload method.");
+             error:(NSError * __autoreleasing *)error;
 
 /**
- * @deprecated - Use the setupCommissioningSessionWithPayload API to pair devices
- *
  * Start pairing for a device with the given ID and onboarding payload (QR code
  * or manual setup code).  The payload will be used to discover the device and
  * establish a PASE connection.
@@ -121,11 +115,7 @@ typedef void (^MTRDeviceConnectionCallback)(MTRBaseDevice * _Nullable device, NS
  * for this controller.  That delegate is expected to call commissionDevice
  * after that point if it wants to commission the device.
  */
-- (BOOL)pairDevice:(uint64_t)deviceID
-    onboardingPayload:(NSString *)onboardingPayload
-                error:(NSError * __autoreleasing *)error
-    DEPRECATED_MSG_ATTRIBUTE("Use setupCommissioningSessionWithPayload method.");
-
+- (BOOL)pairDevice:(uint64_t)deviceID onboardingPayload:(NSString *)onboardingPayload error:(NSError * __autoreleasing *)error;
 - (BOOL)commissionDevice:(uint64_t)deviceId
      commissioningParams:(MTRCommissioningParameters *)commissioningParams
                    error:(NSError * __autoreleasing *)error;

src/darwin/Framework/CHIP/MTRDeviceController.mm

@@ -391,14 +391,10 @@ - (BOOL)setupCommissioningSessionWithPayload:(MTRSetupPayload *)payload
     return success;
 }
 
-// Keep this available until clients have migrated
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-implementations"
 - (BOOL)pairDevice:(uint64_t)deviceID
      discriminator:(uint16_t)discriminator
       setupPINCode:(uint32_t)setupPINCode
              error:(NSError * __autoreleasing *)error
-#pragma clang diagnostic pop
 {
     VerifyOrReturnValue([self checkIsRunning:error], NO);
 
@@ -423,15 +419,11 @@ - (BOOL)pairDevice:(uint64_t)deviceID
     return success;
 }
 
-// Keep this available until clients have migrated
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-implementations"
 - (BOOL)pairDevice:(uint64_t)deviceID
            address:(NSString *)address
               port:(uint16_t)port
       setupPINCode:(uint32_t)setupPINCode
              error:(NSError * __autoreleasing *)error
-#pragma clang diagnostic pop
 {
     VerifyOrReturnValue([self checkIsRunning:error], NO);
 
@@ -453,11 +445,7 @@ - (BOOL)pairDevice:(uint64_t)deviceID
     return success;
 }
 
-// Keep this available until clients have migrated
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-implementations"
 - (BOOL)pairDevice:(uint64_t)deviceID onboardingPayload:(NSString *)onboardingPayload error:(NSError * __autoreleasing *)error
-#pragma clang diagnostic pop
 {
     VerifyOrReturnValue([self checkIsRunning:error], NO);
 

src/darwin/Framework/CHIP/MTRDeviceControllerOverXPC.m

@@ -57,39 +57,27 @@ - (BOOL)setupCommissioningSessionWithPayload:(MTRSetupPayload *)payload
     return NO;
 }
 
-// Keep this available until clients have migrated
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-implementations"
 - (BOOL)pairDevice:(uint64_t)deviceID
      discriminator:(uint16_t)discriminator
       setupPINCode:(uint32_t)setupPINCode
              error:(NSError * __autoreleasing *)error
-#pragma clang diagnostic pop
 {
     MTR_LOG_ERROR("MTRDevice doesn't support pairDevice over XPC");
     return NO;
 }
 
-// Keep this available until clients have migrated
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-implementations"
 - (BOOL)pairDevice:(uint64_t)deviceID
            address:(NSString *)address
               port:(uint16_t)port
      discriminator:(uint16_t)discriminator
       setupPINCode:(uint32_t)setupPINCode
              error:(NSError * __autoreleasing *)error
-#pragma clang diagnostic pop
 {
     MTR_LOG_ERROR("MTRDevice doesn't support pairDevice over XPC");
     return NO;
 }
 
-// Keep this available until clients have migrated
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-implementations"
 - (BOOL)pairDevice:(uint64_t)deviceID onboardingPayload:(NSString *)onboardingPayload error:(NSError * __autoreleasing *)error
-#pragma clang diagnostic pop
 {
     MTR_LOG_ERROR("MTRDevice doesn't support pairDevice over XPC");
     return NO;