Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
40 changes: 12 additions & 28 deletions MobileWeather.xcodeproj/project.pbxproj
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
E491A70219F7C60500F82A4D /* UI */,
E48C4DAC19FE918F00A90448 /* Location */,
E48C4D8E19FE706F00A90448 /* Weather */,
E441104E19F555B800CF3A8F /* Supporting Files */,
5DC0B72B2182466A00E1B317 /* Supporting Files */,
);
path = MobileWeather;
sourceTree = "<group>";
Expand All @@ -220,6 +220,17 @@
name = Utilities;
sourceTree = "<group>";
};
5DC0B72B2182466A00E1B317 /* Supporting Files */ = {
isa = PBXGroup;
children = (
5DB7EDCA1D89CC3800B62BB7 /* Images.xcassets */,
5DB7EDC81D89CC2C00B62BB7 /* Settings.bundle */,
E427582D1A0B75C000AA42B1 /* main.m */,
E427582E1A0B75C000AA42B1 /* Info.plist */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
ACA98BA4794368CA002C5DC3 /* Pods */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -270,17 +281,6 @@
name = Unit;
sourceTree = "<group>";
};
E441104E19F555B800CF3A8F /* Supporting Files */ = {
isa = PBXGroup;
children = (
5DB7EDCA1D89CC3800B62BB7 /* Images.xcassets */,
5DB7EDC81D89CC2C00B62BB7 /* Settings.bundle */,
E427582D1A0B75C000AA42B1 /* main.m */,
E427582E1A0B75C000AA42B1 /* Info.plist */,
);
path = "Supporting Files";
sourceTree = "<group>";
};
E45EADF41AE92D9B0046D883 /* Localization */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -373,7 +373,6 @@
1E555E2F18466B6500B143B4 /* Resources */,
E410DDBF1B441709008F1F0E /* Embed Frameworks */,
F5F9E58BB96BD000574644DE /* [CP] Embed Pods Frameworks */,
A98C8C615BCAA52AEE18061C /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -463,21 +462,6 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
A98C8C615BCAA52AEE18061C /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MobileWeather/Pods-MobileWeather-resources.sh\"\n";
showEnvVarsInLog = 0;
};
F5F9E58BB96BD000574644DE /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,16 @@
<Bucket
type = "0"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
scope = "0"
stopOnStyle = "0">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
2 changes: 1 addition & 1 deletion MobileWeather/Settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
#define PREFS_UNITS_KEY @"unit"
#define PREFS_UNITS_METRIC_KEY @"unitmetric"
#define PREFS_UNITS_IMPERIAL_KEY @"unitimperial"
#define PREFS_WEATHER_API_KEY @"892732f2c814107f556d2ab426a10cbf"
#define PREFS_WEATHER_API_KEY @"713e2acc766caaf015c1a879a18ef1a6"

#endif
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ platform :ios, '8.0'
use_frameworks!

target 'MobileWeather' do
pod 'SmartDeviceLink', '~> 5.2'
pod 'SmartDeviceLink', '~> 6.1'
end
19 changes: 12 additions & 7 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
PODS:
- BiSON (1.1.1)
- SmartDeviceLink (5.2.0):
- SmartDeviceLink (6.1.0):
- BiSON (~> 1.1.1)
- SmartDeviceLink/Default (= 5.2.0)
- SmartDeviceLink/Default (5.2.0):
- SmartDeviceLink/Default (= 6.1.0)
- SmartDeviceLink/Default (6.1.0):
- BiSON (~> 1.1.1)

DEPENDENCIES:
- SmartDeviceLink (~> 5.2)
- SmartDeviceLink (~> 6.1)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- BiSON
- SmartDeviceLink

SPEC CHECKSUMS:
BiSON: 2663348e6c64bfbf9cc82e4b0b3f7eed2cb3eb6b
SmartDeviceLink: 3e6d6f68cb7a20929e3db0f61a3009f626117fe8
SmartDeviceLink: 3d9f40953ade1d49e4bd5a8c0df9e6beae47e561

PODFILE CHECKSUM: 08dca85205f71df0fa2fad739e493c9f6b8f48ab
PODFILE CHECKSUM: 7331e3b77616651e6b674a09cf10167005ce3d11

COCOAPODS: 1.4.0
COCOAPODS: 1.5.3
19 changes: 12 additions & 7 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading