From 81f7d1d2fb7e92bf4bd4b0504a41edbdef511d7d Mon Sep 17 00:00:00 2001 From: Frank Elias Date: Thu, 20 May 2021 16:38:31 -0400 Subject: [PATCH 1/3] podfile update --- Podfile | 4 ++-- Podfile.lock | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Podfile b/Podfile index d6df850..a057bd9 100644 --- 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', '~> 7.1' + 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 index dc9cc81..bd3ae74 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -7,17 +7,26 @@ PODS: - BiSON (~> 1.2) DEPENDENCIES: - - SmartDeviceLink (~> 7.1) + - SmartDeviceLink (from `https://github.com/smartdevicelink/sdl_ios.git`, branch `hotfix/7.1.1`) SPEC REPOS: trunk: - BiSON - - SmartDeviceLink + +EXTERNAL SOURCES: + SmartDeviceLink: + :branch: hotfix/7.1.1 + :git: https://github.com/smartdevicelink/sdl_ios.git + +CHECKOUT OPTIONS: + SmartDeviceLink: + :commit: d670fa8e562be1ed5607bec15b631a65f0070f3d + :git: https://github.com/smartdevicelink/sdl_ios.git SPEC CHECKSUMS: BiSON: efb26805ec99f4ad516b77e9a32ced05f1c0985d SmartDeviceLink: abdd3273e6da415cb9340954e82852433ae4cf9a -PODFILE CHECKSUM: babeb44ba65bb67091ee3d2517c78025629298b3 +PODFILE CHECKSUM: 814aad64143aeac02f9fd84f0741aa80df91eaf9 COCOAPODS: 1.10.1 From 166fe16ab7904da6f42a248d0e84a769e972dbca Mon Sep 17 00:00:00 2001 From: Joel Fischer Date: Mon, 24 May 2021 13:36:44 -0400 Subject: [PATCH 2/3] Update for sdl_ios 7.1.1 --- Podfile | 4 ++-- Podfile.lock | 23 +++++++---------------- SmartDeviceLinkService.m | 4 ++-- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/Podfile b/Podfile index a057bd9..0f791ee 100644 --- 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', :branch => 'hotfix/7.1.1' -# pod 'SmartDeviceLink', '~> 7.1' +# 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 index bd3ae74..830b9cb 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,32 +1,23 @@ 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: - - SmartDeviceLink (from `https://github.com/smartdevicelink/sdl_ios.git`, branch `hotfix/7.1.1`) + - SmartDeviceLink (~> 7.1) SPEC REPOS: trunk: - BiSON - -EXTERNAL SOURCES: - SmartDeviceLink: - :branch: hotfix/7.1.1 - :git: https://github.com/smartdevicelink/sdl_ios.git - -CHECKOUT OPTIONS: - SmartDeviceLink: - :commit: d670fa8e562be1ed5607bec15b631a65f0070f3d - :git: https://github.com/smartdevicelink/sdl_ios.git + - SmartDeviceLink SPEC CHECKSUMS: BiSON: efb26805ec99f4ad516b77e9a32ced05f1c0985d - SmartDeviceLink: abdd3273e6da415cb9340954e82852433ae4cf9a + SmartDeviceLink: 9f00196ee6b4fc2f9bd2e8321de2b47a1258109e -PODFILE CHECKSUM: 814aad64143aeac02f9fd84f0741aa80df91eaf9 +PODFILE CHECKSUM: 6458ae1192665bc1781ad13cb2576fa31d74fc25 COCOAPODS: 1.10.1 diff --git a/SmartDeviceLinkService.m b/SmartDeviceLinkService.m index 9939368..c7ea5e2 100644 --- 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]; From 3751ad1e4197816ee0fb650a0c24842fc29fad7a Mon Sep 17 00:00:00 2001 From: Joel Fischer Date: Mon, 24 May 2021 13:43:31 -0400 Subject: [PATCH 3/3] Update app version --- MobileWeather.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MobileWeather.xcodeproj/project.pbxproj b/MobileWeather.xcodeproj/project.pbxproj index 34a7adb..4b1a746 100644 --- 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 = "";