Skip to content

Commit e544983

Browse files
joeljfischerjoeljfischer
authored
Merge pull request #10 from SmartDeviceLink-Examples/feature/library-6.7
Update v5.3.0 - for SDL iOS v6.7.0
2 parents 3ef1430 + 43adcf1 commit e544983

File tree

1,004 files changed

+285
-73415
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,004 files changed

+285
-73415
lines changed

‎.DS_Store‎

2 KB
Binary file not shown.

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ xcuserdata/
3333
# you should judge for yourself, the pros and cons are mentioned at:
3434
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
3535
#
36-
# Pods/
36+
Pods/
3737

3838
# Carthage
3939
#

‎5.2‎

Whitespace-only changes.

‎MobileWeather.xcodeproj/project.pbxproj‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
1E555E3918466B6500B143B4 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E555E3818466B6500B143B4 /* UIKit.framework */; };
1212
1E555E4518466B6500B143B4 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E555E4418466B6500B143B4 /* AppDelegate.m */; };
1313
1E555E4B18466B6500B143B4 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E555E4A18466B6500B143B4 /* MainViewController.m */; };
14+
4A55CAFA24C76D35008065DA /* Launch.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4A55CAF924C76D35008065DA /* Launch.storyboard */; };
1415
5DB7EDC91D89CC2C00B62BB7 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 5DB7EDC81D89CC2C00B62BB7 /* Settings.bundle */; };
1516
5DB7EDCB1D89CC3800B62BB7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5DB7EDCA1D89CC3800B62BB7 /* Images.xcassets */; };
1617
6E04EAC31CF4E52A00115C2F /* Localization.m in Sources */ = {isa = PBXBuildFile; fileRef = E4BD7AEE1B023A2C006BE23B /* Localization.m */; };
@@ -68,6 +69,7 @@
6869
1E555E4418466B6500B143B4 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
6970
1E555E4918466B6500B143B4 /* MainViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MainViewController.h; sourceTree = "<group>"; };
7071
1E555E4A18466B6500B143B4 /* MainViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = "<group>"; };
72+
4A55CAF924C76D35008065DA /* Launch.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Launch.storyboard; sourceTree = "<group>"; };
7173
56FBAA80C3ED8E16429896CD /* Pods-MobileWeather.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MobileWeather.release.xcconfig"; path = "Pods/Target Support Files/Pods-MobileWeather/Pods-MobileWeather.release.xcconfig"; sourceTree = "<group>"; };
7274
5DB7EDC81D89CC2C00B62BB7 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Settings.bundle; path = MobileWeather/Settings.bundle; sourceTree = SOURCE_ROOT; };
7375
5DB7EDCA1D89CC3800B62BB7 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = MobileWeather/Images.xcassets; sourceTree = SOURCE_ROOT; };
@@ -227,6 +229,7 @@
227229
5DB7EDC81D89CC2C00B62BB7 /* Settings.bundle */,
228230
E427582D1A0B75C000AA42B1 /* main.m */,
229231
E427582E1A0B75C000AA42B1 /* Info.plist */,
232+
4A55CAF924C76D35008065DA /* Launch.storyboard */,
230233
);
231234
name = "Supporting Files";
232235
sourceTree = "<group>";
@@ -389,7 +392,7 @@
389392
1E555E2918466B6500B143B4 /* Project object */ = {
390393
isa = PBXProject;
391394
attributes = {
392-
LastUpgradeCheck = 0920;
395+
LastUpgradeCheck = 1160;
393396
ORGANIZATIONNAME = Ford;
394397
TargetAttributes = {
395398
1E555E3018466B6500B143B4 = {
@@ -411,6 +414,7 @@
411414
developmentRegion = English;
412415
hasScannedForEncodings = 0;
413416
knownRegions = (
417+
English,
414418
en,
415419
de,
416420
es,
@@ -436,6 +440,7 @@
436440
E44272FB1B00A5FC0018EA4F /* Localizable.strings in Resources */,
437441
5DB7EDCB1D89CC3800B62BB7 /* Images.xcassets in Resources */,
438442
E436919A19F556D800678C1D /* Main.storyboard in Resources */,
443+
4A55CAFA24C76D35008065DA /* Launch.storyboard in Resources */,
439444
E43D8D5D1B32E50D00FB8717 /* Localizable.stringsdict in Resources */,
440445
5DB7EDC91D89CC2C00B62BB7 /* Settings.bundle in Resources */,
441446
);
@@ -468,7 +473,7 @@
468473
files = (
469474
);
470475
inputPaths = (
471-
"${SRCROOT}/Pods/Target Support Files/Pods-MobileWeather/Pods-MobileWeather-frameworks.sh",
476+
"${PODS_ROOT}/Target Support Files/Pods-MobileWeather/Pods-MobileWeather-frameworks.sh",
472477
"${BUILT_PRODUCTS_DIR}/BiSON/BiSON.framework",
473478
"${BUILT_PRODUCTS_DIR}/SmartDeviceLink/SmartDeviceLink.framework",
474479
);
@@ -479,7 +484,7 @@
479484
);
480485
runOnlyForDeploymentPostprocessing = 0;
481486
shellPath = /bin/sh;
482-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MobileWeather/Pods-MobileWeather-frameworks.sh\"\n";
487+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MobileWeather/Pods-MobileWeather-frameworks.sh\"\n";
483488
showEnvVarsInLog = 0;
484489
};
485490
/* End PBXShellScriptBuildPhase section */
@@ -657,17 +662,19 @@
657662
isa = XCBuildConfiguration;
658663
baseConfigurationReference = C407ED364EBBDDB306D541A8 /* Pods-MobileWeather.debug.xcconfig */;
659664
buildSettings = {
665+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
660666
ALWAYS_SEARCH_USER_PATHS = NO;
661667
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
662-
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
663668
CODE_SIGN_IDENTITY = "iPhone Developer";
664669
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
665670
CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
671+
CURRENT_PROJECT_VERSION = 1;
666672
DEVELOPMENT_TEAM = NCVC2MHU7M;
667673
GCC_PRECOMPILE_PREFIX_HEADER = YES;
668674
INFOPLIST_FILE = MobileWeather/Info.plist;
669675
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
670676
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
677+
MARKETING_VERSION = 5.3.0;
671678
PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.mobileweather;
672679
PRODUCT_NAME = "$(TARGET_NAME)";
673680
PROVISIONING_PROFILE = "";
@@ -681,15 +688,16 @@
681688
buildSettings = {
682689
ALWAYS_SEARCH_USER_PATHS = NO;
683690
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
684-
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
685691
CODE_SIGN_IDENTITY = "iPhone Developer";
686692
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
687693
CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
694+
CURRENT_PROJECT_VERSION = 1;
688695
DEVELOPMENT_TEAM = NCVC2MHU7M;
689696
GCC_PRECOMPILE_PREFIX_HEADER = YES;
690697
INFOPLIST_FILE = MobileWeather/Info.plist;
691698
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
692699
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
700+
MARKETING_VERSION = 5.3.0;
693701
PRODUCT_BUNDLE_IDENTIFIER = com.yourcompany.mobileweather;
694702
PRODUCT_NAME = "$(TARGET_NAME)";
695703
PROVISIONING_PROFILE = "";

‎MobileWeather/.DS_Store‎

0 Bytes
Binary file not shown.

‎MobileWeather/DarkSkyProcessor.m‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
// Copyright (c) 2013-2015 Ford Motor Company. All rights reserved.
66
//
77

8+
@import SmartDeviceLink;
9+
810
#import "DarkSkyProcessor.h"
911

1012
#import "Forecast.h"
@@ -67,12 +69,12 @@ + (WeatherConditions *)weatherConditions:(NSDictionary *)json {
6769
}
6870

6971
+ (NSArray *)dailyForecast:(NSDictionary *)json {
70-
NSLog(@"starting daily forecast");
72+
SDLLogD(@"Processing daily forecast");
7173
return [self processForecast:json forType:KEY_DAILY];
7274
}
7375

7476
+ (NSArray *)hourlyForecast:(NSDictionary *)json {
75-
NSLog(@"starting hourly forecast");
77+
SDLLogD(@"Processing hourly forecast");
7678
return [self processForecast:json forType:KEY_HOURLY];
7779
}
7880

‎MobileWeather/DarkSkyService.m‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
// Copyright (c) 2013-2015 Ford Motor Company. All rights reserved.
66
//
77

8+
@import SmartDeviceLink;
9+
810
#import "DarkSkyService.h"
911

1012
#import "Notifications.h"
@@ -62,13 +64,13 @@ - (void)updateWeatherDataFromUrl:(NSURL *)url forLanguage:(WeatherLanguage *)lan
6264

6365
self.currentTask = [[NSURLSession sharedSession] dataTaskWithURL:url completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
6466
if (error != nil) {
65-
NSLog(@"Error retrieving weather data");
67+
SDLLogE(@"Error retrieving weather data");
6668
return;
6769
}
6870

6971
NSDictionary *jsonData = [NSJSONSerialization JSONObjectWithData:data options:0 error:nil];
7072
if (jsonData == nil) {
71-
NSLog(@"Error parsing weather data");
73+
SDLLogE(@"Error parsing weather data");
7274
return;
7375
}
7476

‎MobileWeather/Images.xcassets/.DS_Store‎

6 KB
Binary file not shown.

‎MobileWeather/Images.xcassets/AppIcon.appiconset/App Store - alpha [email protected]‎

335 KB

‎MobileWeather/Images.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,78 @@
11
{
22
"images" : [
33
{
4+
"filename" : "iPhone Notification [email protected]",
45
"idiom" : "iphone",
5-
"size" : "20x20",
6-
"scale" : "2x"
6+
"scale" : "2x",
7+
"size" : "20x20"
78
},
89
{
10+
"filename" : "iPhone Notification [email protected]",
911
"idiom" : "iphone",
10-
"size" : "20x20",
11-
"scale" : "3x"
12+
"scale" : "3x",
13+
"size" : "20x20"
1214
},
1315
{
14-
"size" : "29x29",
16+
"filename" : "iPhone Settings [email protected]",
1517
"idiom" : "iphone",
16-
"filename" : "icon29.png",
17-
"scale" : "1x"
18+
"scale" : "1x",
19+
"size" : "29x29"
1820
},
1921
{
20-
"size" : "29x29",
22+
"filename" : "iPhone Settings [email protected]",
2123
"idiom" : "iphone",
22-
"filename" : "icon58.png",
23-
"scale" : "2x"
24+
"scale" : "2x",
25+
"size" : "29x29"
2426
},
2527
{
28+
"filename" : "iPhone Settings [email protected]",
2629
"idiom" : "iphone",
27-
"size" : "29x29",
28-
"scale" : "3x"
30+
"scale" : "3x",
31+
"size" : "29x29"
2932
},
3033
{
31-
"size" : "40x40",
34+
"filename" : "iPhone Spotlight [email protected]",
3235
"idiom" : "iphone",
33-
"filename" : "icon80.png",
34-
"scale" : "2x"
36+
"scale" : "2x",
37+
"size" : "40x40"
3538
},
3639
{
40+
"filename" : "iPhone Spotlight [email protected]",
3741
"idiom" : "iphone",
38-
"size" : "40x40",
39-
"scale" : "3x"
42+
"scale" : "3x",
43+
"size" : "40x40"
4044
},
4145
{
42-
"size" : "57x57",
4346
"idiom" : "iphone",
44-
"filename" : "icon57.png",
45-
"scale" : "1x"
47+
"scale" : "1x",
48+
"size" : "57x57"
4649
},
4750
{
48-
"size" : "57x57",
4951
"idiom" : "iphone",
50-
"filename" : "icon114.png",
51-
"scale" : "2x"
52+
"scale" : "2x",
53+
"size" : "57x57"
5254
},
5355
{
54-
"size" : "60x60",
56+
"filename" : "iPhone App [email protected]",
5557
"idiom" : "iphone",
56-
"filename" : "icon120.png",
57-
"scale" : "2x"
58+
"scale" : "2x",
59+
"size" : "60x60"
5860
},
5961
{
62+
"filename" : "iPhone App [email protected]",
6063
"idiom" : "iphone",
61-
"size" : "60x60",
62-
"scale" : "3x"
64+
"scale" : "3x",
65+
"size" : "60x60"
6366
},
6467
{
68+
"filename" : "App Store - alpha [email protected]",
6569
"idiom" : "ios-marketing",
66-
"size" : "1024x1024",
67-
"scale" : "1x"
70+
"scale" : "1x",
71+
"size" : "1024x1024"
6872
}
6973
],
7074
"info" : {
71-
"version" : 1,
72-
"author" : "xcode"
75+
"author" : "xcode",
76+
"version" : 1
7377
}
74-
}
78+
}

0 commit comments

Comments
 (0)