Deprecate SDLSetDisplayLayoutResponsebugfix/issue-1785-deprecate-setdisplaylayout

5 files changed, 17 insertions, 1 deletions

diff --git a/SmartDeviceLink/public/SDLSetDisplayLayoutResponse.h b/SmartDeviceLink/public/SDLSetDisplayLayoutResponse.h
index 69987222d..21d4f103f 100644
--- a/SmartDeviceLink/public/SDLSetDisplayLayoutResponse.h
+++ b/SmartDeviceLink/public/SDLSetDisplayLayoutResponse.h
@@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 
  Since SmartDeviceLink 2.0
  */
+__deprecated_msg("Use SDLManager.screenManager.changeLayout() instead")
 @interface SDLSetDisplayLayoutResponse : SDLRPCResponse
 
 /**
diff --git a/SmartDeviceLink/public/SDLSetDisplayLayoutResponse.m b/SmartDeviceLink/public/SDLSetDisplayLayoutResponse.m
index 552a95079..7d3380b7b 100644
--- a/SmartDeviceLink/public/SDLSetDisplayLayoutResponse.m
+++ b/SmartDeviceLink/public/SDLSetDisplayLayoutResponse.m
@@ -14,7 +14,10 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-implementations"
 @implementation SDLSetDisplayLayoutResponse
+#pragma clang diagnostic pop
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLTextAndGraphicUpdateOperationSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLTextAndGraphicUpdateOperationSpec.m
index 76876fcd1..77760bb07 100644
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLTextAndGraphicUpdateOperationSpec.m
+++ b/SmartDeviceLinkTests/DevAPISpecs/SDLTextAndGraphicUpdateOperationSpec.m
@@ -67,9 +67,12 @@ describe(@"the text and graphic operation", ^{
     __block SDLWindowCapability *allEnabledCapability = [[SDLWindowCapability alloc] init];
 
     __block SDLShowResponse *successShowResponse = [[SDLShowResponse alloc] init];
-    __block SDLSetDisplayLayoutResponse *successSetDisplayLayoutResponse = [[SDLSetDisplayLayoutResponse alloc] init];
     __block SDLShowResponse *failShowResponse = [[SDLShowResponse alloc] init];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    __block SDLSetDisplayLayoutResponse *successSetDisplayLayoutResponse = [[SDLSetDisplayLayoutResponse alloc] init];
     __block SDLSetDisplayLayoutResponse *failSetDisplayLayoutResponse = [[SDLSetDisplayLayoutResponse alloc] init];
+#pragma clang diagnostic pop
     __block SDLTextAndGraphicState *emptyCurrentData = nil;
 
     __block SDLTextAndGraphicState *receivedState = nil;
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m
index 7a82e0456..99a89526b 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m
@@ -24,6 +24,8 @@ SDLButtonCapabilities* button = [[SDLButtonCapabilities alloc] init];
 SDLSoftButtonCapabilities* softButton = [[SDLSoftButtonCapabilities alloc] init];
 SDLPresetBankCapabilities* presetBank = [[SDLPresetBankCapabilities alloc] init];
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 describe(@"Getter/Setter Tests", ^ {
     it(@"Should set and get correctly", ^ {
         SDLSetDisplayLayoutResponse* testResponse = [[SDLSetDisplayLayoutResponse alloc] init];
@@ -67,5 +69,6 @@ describe(@"Getter/Setter Tests", ^ {
         expect(testResponse.presetBankCapabilities).to(beNil());
     });
 });
+#pragma clang diagnostic pop
 
 QuickSpecEnd
diff --git a/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m b/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m
index d07586e7e..184ad81a7 100644
--- a/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m
+++ b/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m
@@ -435,10 +435,16 @@ describe(@"System capability manager", ^{
     });
 
     context(@"When notified of a SetDisplayLayout Response", ^ {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         __block SDLSetDisplayLayoutResponse *testSetDisplayLayoutResponse = nil;
+#pragma clang diagnostic pop
 
         beforeEach(^{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
             testSetDisplayLayoutResponse = [[SDLSetDisplayLayoutResponse alloc] init];
+#pragma clang diagnostic pop
             testSetDisplayLayoutResponse.displayCapabilities = testDisplayCapabilities;
             testSetDisplayLayoutResponse.buttonCapabilities = testButtonCapabilities;
             testSetDisplayLayoutResponse.softButtonCapabilities = testSoftButtonCapabilities;