Merge branch 'feature/sdl-7.1.1'

SmartDeviceLink-Examples · May 24, 2021 · 122e3e1 · 122e3e1
2 parents d522b8e + 3751ad1
commit 122e3e1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/MobileWeather.xcodeproj/project.pbxproj b/MobileWeather.xcodeproj/project.pbxproj
@@ -674,7 +674,7 @@
 				INFOPLIST_FILE = MobileWeather/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 5.5.1;
+				MARKETING_VERSION = 5.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.sdl.sdlweather;
 				PRODUCT_NAME = "SDL Weather";
 				PROVISIONING_PROFILE = "";
@@ -697,7 +697,7 @@
 				INFOPLIST_FILE = MobileWeather/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 5.5.1;
+				MARKETING_VERSION = 5.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.sdl.sdlweather;
 				PRODUCT_NAME = "SDL Weather";
 				PROVISIONING_PROFILE = "";

diff --git a/Podfile b/Podfile
@@ -2,6 +2,6 @@ platform :ios, '10.0'
 use_frameworks!
 
 target 'MobileWeather' do
-#   pod 'SmartDeviceLink', :git => 'https://github.com/smartdevicelink/sdl_ios.git', :tag => '7.1.0'
+#   pod 'SmartDeviceLink', :git => 'https://github.com/smartdevicelink/sdl_ios.git', :branch => 'hotfix/7.1.1'
    pod 'SmartDeviceLink', '~> 7.1'
 end
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,9 +1,9 @@
 PODS:
   - BiSON (1.2.2)
-  - SmartDeviceLink (7.1.0):
+  - SmartDeviceLink (7.1.1):
     - BiSON (~> 1.2)
-    - SmartDeviceLink/Default (= 7.1.0)
-  - SmartDeviceLink/Default (7.1.0):
+    - SmartDeviceLink/Default (= 7.1.1)
+  - SmartDeviceLink/Default (7.1.1):
     - BiSON (~> 1.2)
 
 DEPENDENCIES:
@@ -16,8 +16,8 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   BiSON: efb26805ec99f4ad516b77e9a32ced05f1c0985d
-  SmartDeviceLink: abdd3273e6da415cb9340954e82852433ae4cf9a
+  SmartDeviceLink: 9f00196ee6b4fc2f9bd2e8321de2b47a1258109e
 
-PODFILE CHECKSUM: babeb44ba65bb67091ee3d2517c78025629298b3
+PODFILE CHECKSUM: 6458ae1192665bc1781ad13cb2576fa31d74fc25
 
 COCOAPODS: 1.10.1
diff --git a/SmartDeviceLinkService.m b/SmartDeviceLinkService.m
@@ -78,8 +78,8 @@ - (void)start {
     self.localization = [Localization defaultLocalization];
 
     // Change which config you need based on if you want to connect to a TDK (default) or a wifi based emulator (debug)
-//    SDLLifecycleConfiguration *lifecycleConfig = [SDLLifecycleConfiguration defaultConfigurationWithAppName:@"MobileWeather" fullAppId:@"330533107"];
-    SDLLifecycleConfiguration *lifecycleConfig = [SDLLifecycleConfiguration debugConfigurationWithAppName:@"MobileWeather" fullAppId:@"330533107" ipAddress:@"m.sdl.tools" port:11427];
+    SDLLifecycleConfiguration *lifecycleConfig = [SDLLifecycleConfiguration defaultConfigurationWithAppName:@"MobileWeather" fullAppId:@"330533107"];
+//    SDLLifecycleConfiguration *lifecycleConfig = [SDLLifecycleConfiguration debugConfigurationWithAppName:@"MobileWeather" fullAppId:@"330533107" ipAddress:@"192.168.45.2" port:12345];
     lifecycleConfig.ttsName = [SDLTTSChunk textChunksFromString:NSLocalizedString(@"app.tts-name", nil)];
     lifecycleConfig.voiceRecognitionCommandNames = @[NSLocalizedString(@"app.vr-synonym", nil)];
     lifecycleConfig.appIcon = [SDLArtwork persistentArtworkWithImage:[UIImage imageNamed:@"sdl-appicon"] name:@"AppIcon" asImageFormat:SDLArtworkImageFormatPNG];