Skip to content

Commit 00eb72f

Browse files
author
Frank Elias
committed
update to SDL 7.0.0
update to SDL 7.0.0
1 parent 650727d commit 00eb72f

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

MobileWeather.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@
609609
GCC_WARN_UNINITIALIZED_AUTOS = YES;
610610
GCC_WARN_UNUSED_FUNCTION = YES;
611611
GCC_WARN_UNUSED_VARIABLE = YES;
612-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
612+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
613613
ONLY_ACTIVE_ARCH = YES;
614614
SDKROOT = iphoneos;
615615
VALIDATE_PRODUCT = YES;
@@ -652,7 +652,7 @@
652652
GCC_WARN_UNINITIALIZED_AUTOS = YES;
653653
GCC_WARN_UNUSED_FUNCTION = YES;
654654
GCC_WARN_UNUSED_VARIABLE = YES;
655-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
655+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
656656
SDKROOT = iphoneos;
657657
VALIDATE_PRODUCT = YES;
658658
};

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform :ios, '9.0'
1+
platform :ios, '10.0'
22
use_frameworks!
33

44
target 'MobileWeather' do

Podfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PODS:
22
- BiSON (1.2.0)
3-
- SmartDeviceLink (6.6.0):
3+
- SmartDeviceLink (7.0.0-rc.1):
44
- BiSON (~> 1.2.0)
5-
- SmartDeviceLink/Default (= 6.6.0)
6-
- SmartDeviceLink/Default (6.6.0):
5+
- SmartDeviceLink/Default (= 7.0.0-rc.1)
6+
- SmartDeviceLink/Default (7.0.0-rc.1):
77
- BiSON (~> 1.2.0)
88

99
DEPENDENCIES:
@@ -20,13 +20,13 @@ EXTERNAL SOURCES:
2020

2121
CHECKOUT OPTIONS:
2222
SmartDeviceLink:
23-
:commit: 905175db124c1c80a7ae9611b98c48d7f9b2a2bd
23+
:commit: 924c510363f406ba3527458e9e13581a4890b6f7
2424
:git: https://github.com/smartdevicelink/sdl_ios.git
2525

2626
SPEC CHECKSUMS:
2727
BiSON: 1165a5486ee9755400b096cf374e1f03cb73a980
28-
SmartDeviceLink: 7971e530adc02d0540c8dba7a049a0edbebf97a1
28+
SmartDeviceLink: 5cb83937ad4b39da4ee67a5aee8e698c201270a1
2929

30-
PODFILE CHECKSUM: 6ca963dcdb2e354f2dc698c9fadf910a0c5a71b9
30+
PODFILE CHECKSUM: 00b30227d0e4947505e4e6a3100b07f2b0548595
3131

3232
COCOAPODS: 1.9.3

SmartDeviceLinkService.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ - (void)start {
103103

104104
// set the app display layout to the non-media template
105105
if ([self.templatesAvailable containsObject:SDLPredefinedLayoutNonMedia]) {
106-
SDLSetDisplayLayout *request = [[SDLSetDisplayLayout alloc] initWithLayout:SDLPredefinedLayoutNonMedia];
107-
[self.manager sendRequest:request];
106+
SDLTemplateConfiguration *template = [[SDLTemplateConfiguration alloc] initWithPredefinedLayout:SDLPredefinedLayoutNonMedia];
107+
[self.manager.screenManager changeLayout:template withCompletionHandler:nil];
108108
} else {
109109
// This head unit isn't supported
110110
SDLLogE(@"The non-media template isn't supported. This app may not work properly");
@@ -819,7 +819,7 @@ - (void)sendDefaultGlobalProperties {
819819

820820
NSString *promptString = [prompts componentsJoinedByString:@","];
821821

822-
SDLSetGlobalProperties *request = [[SDLSetGlobalProperties alloc] initWithHelpText:promptString timeoutText:promptString vrHelpTitle:self.localization[@"app.name"] vrHelp:[helpitems copy] menuTitle:nil menuIcon:nil keyboardProperties:nil menuLayout:nil];
822+
SDLSetGlobalProperties *request = [[SDLSetGlobalProperties alloc] initWithUserLocation:nil helpPrompt:[SDLTTSChunk textChunksFromString:promptString] timeoutPrompt:[SDLTTSChunk textChunksFromString:promptString] vrHelpTitle:self.localization[@"app.name"] vrHelp:[helpitems copy] menuTitle:nil menuIcon:nil keyboardProperties:nil menuLayout:nil];
823823
[self.manager sendRequest:request];
824824
}
825825

@@ -861,7 +861,7 @@ - (void)sendListGlobalProperties:(MWInfoType)infoType withPrevious:(BOOL)withPre
861861

862862
NSString *promptString = [prompts componentsJoinedByString:@","];
863863

864-
SDLSetGlobalProperties *request = [[SDLSetGlobalProperties alloc] initWithHelpText:promptString timeoutText:promptString vrHelpTitle:self.localization[@"app.name"] vrHelp:[items copy] menuTitle:nil menuIcon:nil keyboardProperties:nil menuLayout:nil];
864+
SDLSetGlobalProperties *request = [[SDLSetGlobalProperties alloc] initWithUserLocation:nil helpPrompt:[SDLTTSChunk textChunksFromString:promptString] timeoutPrompt:[SDLTTSChunk textChunksFromString:promptString] vrHelpTitle:self.localization[@"app.name"] vrHelp:[items copy] menuTitle:nil menuIcon:nil keyboardProperties:nil menuLayout:nil];
865865
[self.manager sendRequest:request];
866866
}
867867

0 commit comments

Comments
 (0)