Merge branch 'feature/sdl-7.0'

Author: joeljfischer

.DS_Store

@@ -609,7 +609,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
@@ -652,7 +652,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};

MobileWeather.xcodeproj/project.pbxproj

@@ -1,6 +1,7 @@
-platform :ios, '9.0'
+platform :ios, '10.0'
 use_frameworks!
 
 target 'MobileWeather' do
-    pod 'SmartDeviceLink', :git => 'https://github.com/smartdevicelink/sdl_ios.git', :branch => 'develop'
+#    pod 'SmartDeviceLink', :git => 'https://github.com/smartdevicelink/sdl_ios.git', :branch => 'develop'
+  pod 'SmartDeviceLink', '~> 7.0'
 end

Podfile

@@ -1,32 +1,23 @@
 PODS:
-  - BiSON (1.2.0)
-  - SmartDeviceLink (6.6.0):
-    - BiSON (~> 1.2.0)
-    - SmartDeviceLink/Default (= 6.6.0)
-  - SmartDeviceLink/Default (6.6.0):
-    - BiSON (~> 1.2.0)
+  - BiSON (1.2.2)
+  - SmartDeviceLink (7.0.0):
+    - BiSON (~> 1.2.2)
+    - SmartDeviceLink/Default (= 7.0.0)
+  - SmartDeviceLink/Default (7.0.0):
+    - BiSON (~> 1.2.2)
 
 DEPENDENCIES:
-  - SmartDeviceLink (from `https://github.com/smartdevicelink/sdl_ios.git`, branch `develop`)
+  - SmartDeviceLink (~> 7.0)
 
 SPEC REPOS:
   trunk:
     - BiSON
-
-EXTERNAL SOURCES:
-  SmartDeviceLink:
-    :branch: develop
-    :git: https://github.com/smartdevicelink/sdl_ios.git
-
-CHECKOUT OPTIONS:
-  SmartDeviceLink:
-    :commit: 905175db124c1c80a7ae9611b98c48d7f9b2a2bd
-    :git: https://github.com/smartdevicelink/sdl_ios.git
+    - SmartDeviceLink
 
 SPEC CHECKSUMS:
-  BiSON: 1165a5486ee9755400b096cf374e1f03cb73a980
-  SmartDeviceLink: 7971e530adc02d0540c8dba7a049a0edbebf97a1
+  BiSON: efb26805ec99f4ad516b77e9a32ced05f1c0985d
+  SmartDeviceLink: f073aae27d529a70637e76a651f0353d636cf0c5
 
-PODFILE CHECKSUM: 6ca963dcdb2e354f2dc698c9fadf910a0c5a71b9
+PODFILE CHECKSUM: ffa2cab4e67f3181335663dcba8c06324ca5068e
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.10.0

Podfile.lock

@@ -103,8 +103,8 @@ - (void)start {
 
         // set the app display layout to the non-media template
         if ([self.templatesAvailable containsObject:SDLPredefinedLayoutNonMedia]) {
-            SDLSetDisplayLayout *request = [[SDLSetDisplayLayout alloc] initWithLayout:SDLPredefinedLayoutNonMedia];
-            [self.manager sendRequest:request];
+            SDLTemplateConfiguration *template = [[SDLTemplateConfiguration alloc] initWithPredefinedLayout:SDLPredefinedLayoutNonMedia];
+            [self.manager.screenManager changeLayout:template withCompletionHandler:nil];
         } else {
             // This head unit isn't supported
             SDLLogE(@"The non-media template isn't supported. This app may not work properly");
@@ -819,7 +819,7 @@ - (void)sendDefaultGlobalProperties {
 
     NSString *promptString = [prompts componentsJoinedByString:@","];
 
-    SDLSetGlobalProperties *request = [[SDLSetGlobalProperties alloc] initWithHelpText:promptString timeoutText:promptString vrHelpTitle:self.localization[@"app.name"] vrHelp:[helpitems copy] menuTitle:nil menuIcon:nil keyboardProperties:nil menuLayout:nil];
+    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];
     [self.manager sendRequest:request];
 }
 
@@ -861,7 +861,7 @@ - (void)sendListGlobalProperties:(MWInfoType)infoType withPrevious:(BOOL)withPre
 
     NSString *promptString = [prompts componentsJoinedByString:@","];
 
-    SDLSetGlobalProperties *request = [[SDLSetGlobalProperties alloc] initWithHelpText:promptString timeoutText:promptString vrHelpTitle:self.localization[@"app.name"] vrHelp:[items copy] menuTitle:nil menuIcon:nil keyboardProperties:nil menuLayout:nil];
+    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];
     [self.manager sendRequest:request]; 
 }