Merge branch 'master' into hotfix/issue_383

.gitignore

@@ -37,9 +37,10 @@ profile
 # Carthage #
 ############
 Carthage.pkg
-SmartDeviceLink-iOS/Carthage/Build
-SmartDeviceLink-iOS/Carthage/Checkouts
-SmartDeviceLink-iOS/infer-out
+Carthage/Checkouts
+infer-out
 # This ignore here is prevent projects fetching sdl_ios as a submodule using
 # Carthage from resulting as `-dirty` in the `git status`.
 Carthage/Build
+
+docs/docsets/

.travis.yml

@@ -1,23 +1,39 @@
 language: objective-c
-osx_image: xcode7.1
+osx_image: xcode7.3
+xcode_project: SmartDeviceLink-iOS
+xcode_scheme: SmartDeviceLink
+xcode_sdk: iphonesimulator9.3
+env:
+  global:
+    - FRAMEWORK_NAME=SmartDeviceLink
 
 notifications:
   email: false
 
 before_install:
-  - brew update
-  - brew outdated xctool || brew upgrade xctool
-  - curl -OlL "https://github.com/Carthage/Carthage/releases/download/0.11/Carthage.pkg"
-  - sudo installer -pkg "Carthage.pkg" -target /
-  - rm "Carthage.pkg"
+- brew update
+- brew outdated xctool || brew upgrade xctool
+- brew outdated carthage || brew upgrade carthage
 
 before_script:
-  - cd SmartDeviceLink-iOS
-  - carthage bootstrap --platform ios
-  - cd ../
+- carthage bootstrap --platform ios
 
 script:
-  - xctool -project SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj -scheme SmartDeviceLink -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO RUN_CLANG_STATIC_ANALYZER=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES test
+- xctool -project SmartDeviceLink-iOS.xcodeproj -scheme SmartDeviceLink -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO RUN_CLANG_STATIC_ANALYZER=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES test
 
 after_script:
-  - bash <(curl -s https://codecov.io/bash)
+- bash <(curl -s https://codecov.io/bash)
+
+before_deploy:
+  - carthage build --no-skip-current --platform ios
+  - carthage archive $FRAMEWORK_NAME
+
+deploy:
+  provider: releases
+  api_key:
+    secure: p28zh58SsuOu7kD1/OhTklKsuAGD/DbSjBHDW7Tz1Yw+KDOm/RZZwdCmm9s3aroK7imtzSePj16v6Wxg4JT1JbVdNo2meEg/b6Ue0BcifEOx6dxKqeAtutQQdG3xqRIJxPZaK1nm6BSUZ5haaLMEKIFfiumQSaVwQVhs0chP0d4=
+  file: "$FRAMEWORK_NAME.framework.zip"
+  skip_cleanup: true
+  on:
+    repo: smartdevicelink/sdl_ios
+    tags: true

.xctool-args

@@ -1,5 +1,5 @@
 [
-    "-project", "SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj",
+    "-project", "SmartDeviceLink-iOS.xcodeproj",
     "-scheme", "SmartDeviceLink",
     "-sdk", "iphonesimulator",
     "ONLY_ACTIVE_ARCH=NO",

CHANGELOG.md

@@ -1,3 +1,23 @@
+# 4.1.4 Release Notes
+### Bug Fixes
+* Fixed exception causing app to crash when SDL Core disconnects in TCP debug mode. Warning: The app may enter an undefined connection state as there is currently no retry strategy in TCP debug mode.
+
+### Other
+* Update test frameworks
+
+# 4.1.3 Release Notes
+### Enhancements
+* Fix unit tests attempting to be built against Xcode 7.1 instead of Xcode 7.3. (#413)
+* Auto-upload Carthage archives on tag Travis builds. (#413)
+* Move codecov.io settings to the repository in codecov.yml (#415)
+* Add a Jazzy documentation generation script, add theme, and generate documentation for the SDL Developer Portal. (#417)
+
+### Bugfixes
+* Improve video streaming by altering video encoding settings. (#410)
+
+### Other
+* Shift project and code files into the root directory, removing the SmartDeviceLink-iOS directory. (#404)
+
 # 4.1.2 Release Notes
 ### Bugfixes
 * Enable additional static analyzer rules for Xcode 7.3, fix an associated nullability issue.

Cartfile.resolved

@@ -0,0 +1,4 @@
+github "Quick/Nimble" "v4.1.0"
+github "AliSoftware/OHHTTPStubs" "5.1.0"
+github "Quick/Quick" "v0.9.2"
+github "erikdoe/ocmock" "v3.3.1"

README.md

@@ -1,14 +1,17 @@
- [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
+
 [![Version](https://img.shields.io/cocoapods/v/SmartDeviceLink-iOS.svg?style=flat)](https://cocoapods.org/pods/SmartDeviceLink-iOS)
 [![License](https://img.shields.io/cocoapods/l/SmartDeviceLink-iOS.svg?style=flat)](https://cocoapods.org/pods/SmartDeviceLink-iOS)
 [![Build Status](https://img.shields.io/travis/smartdevicelink/sdl_ios/master.svg?style=flat)](https://travis-ci.org/smartdevicelink/sdl_ios)
-[![codecov.io](https://img.shields.io/codecov/c/github/codecov/smartdevicelink/sdl_ios/master.svg?style=flat)](http://codecov.io/github/smartdevicelink/sdl_ios?branch=master)
-[![Slack Status](http://sdlslack.herokuapp.com/badge.svg)](http://slack.smartdevicelink.org)
-
+[![codecov](https://codecov.io/gh/smartdevicelink/sdl_ios/branch/master/graph/badge.svg)](https://codecov.io/gh/smartdevicelink/sdl_ios)
+[![Documentation](https://img.shields.io/cocoapods/metrics/doc-percent/SmartDeviceLink-iOS.svg)](http://cocoadocs.org/docsets/SmartDeviceLink-iOS/)
+[![CocoaPods Downloads](https://img.shields.io/cocoapods/dt/SmartDeviceLink-iOS.svg?maxAge=172800)](https://cocoapods.org/pods/SmartDeviceLink-iOS)
+[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
+[![Slack Status](http://sdlslack.herokuapp.com/badge.svg)](http://slack.smartdevicelink.com)
+
 
 # SmartDeviceLink (SDL)
 
-SmartDeviceLink (SDL) is a standard set of protocols and messages that connect applications on a smartphone to a vehicle head unit. This messaging enables a consumer to interact with their application using common in-vehicle interfaces such as a touch screen display, embedded voice recognition, steering wheel controls and various vehicle knobs and buttons. There are three main components that make up the SDL ecosystem.
+[SmartDeviceLink (SDL)](https://www.smartdevicelink.com) is a standard set of protocols and messages that connect applications on a smartphone to a vehicle head unit. This messaging enables a consumer to interact with their application using common in-vehicle interfaces such as a touch screen display, embedded voice recognition, steering wheel controls and various vehicle knobs and buttons. There are three main components that make up the SDL ecosystem.
 
 * The [Core](https://github.com/smartdevicelink/sdl_core) component is the software which Vehicle Manufacturers (OEMs)  implement in their vehicle head units. Integrating this component into their head unit and HMI based on a set of guidelines and templates enables access to various smartphone applications.
 * The optional [SDL Server](https://github.com/smartdevicelink/sdl_server) can be used by Vehicle OEMs to update application policies and gather usage information for connected applications.
@@ -34,7 +37,7 @@ See the [changelog](https://github.com/smartdevicelink/sdl_ios/blob/master/CHANG
 
 You can install this library using [Cocoapods](https://cocoapods.org/pods/SmartDeviceLink-iOS). You can get started with Cocoapods by [following their install guide](https://guides.cocoapods.org/using/getting-started.html#getting-started), and learn how to use Cocoapods to install dependencies [by following this guide](https://guides.cocoapods.org/using/using-cocoapods.html).
 
-In your podfile, you want to add `pod 'SmartDeviceLink-iOS', '4.1.2'`. Then run `pod install` inside your terminal. With Cocoapods, we support iOS 6+.
+In your podfile, you want to add `pod 'SmartDeviceLink-iOS', '~> 4.1'`. Then run `pod install` inside your terminal. With Cocoapods, we support iOS 6.0+.
 
 ##### Carthage
 
@@ -57,7 +60,6 @@ To run tests, you will need to bootstrap the Carthage testing libraries. To do s
 
 Then, from the root project directory, run:
 ```bash
-cd SmartDeviceLink-iOS
 carthage bootstrap --platform ios
 cd ../
 ```
@@ -188,7 +190,7 @@ self.proxy = nil;
 ```
 
 #### onOnHMIStatus
-When your app receives `onOnHMIStatus` it has changed HMI states on the head unit. For example, your application can be put into `HMI_FULL` meaning that it has full access to the vehicle screen. For more info on HMI Levels, [see the Cocoadoc documentation on the enum](http://cocoadocs.org/docsets/SmartDeviceLink-iOS/4.0.3/Classes/SDLHMILevel.html).
+When your app receives `onOnHMIStatus` it has changed HMI states on the head unit. For example, your application can be put into `HMI_FULL` meaning that it has full access to the vehicle screen. For more info on HMI Levels, [see the Cocoadoc documentation on the enum](http://cocoadocs.org/docsets/SmartDeviceLink-iOS/4.1.4/Classes/SDLHMILevel.html).
 
 You will want to track your first HMI FULL, for instance with a boolean value. The example application has extremely basic tracking of this type in the `onOnHMIStatus` callback.
 

SmartDeviceLink-iOS.podspec

@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
 
 s.name         = "SmartDeviceLink-iOS"
-s.version      = "4.1.2"
+s.version      = "4.1.4"
 s.summary      = "Connect your app with cars!"
 s.homepage     = "https://github.com/smartdevicelink/SmartDeviceLink-iOS"
 s.license      = { :type => "New BSD", :file => "LICENSE" }
 s.author       = { "SmartDeviceLink Team" => "joel@livio.io" }
 s.platform     = :ios, "6.0"
 s.source       = { :git => "https://github.com/smartdevicelink/sdl_ios.git", :tag => s.version.to_s }
-s.source_files = "SmartDeviceLink-iOS/SmartDeviceLink/*.{h,m}"
+s.source_files = "SmartDeviceLink/*.{h,m}"
 s.requires_arc = true
 
 end

SmartDeviceLink-iOS/SmartDeviceLink-iOS.xcodeproj/project.pbxproj → SmartDeviceLink-iOS.xcodeproj/project.pbxproj

@@ -1106,11 +1106,14 @@
 		5D1464331C99AC0900727339 /* OCMock.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = OCMock.framework.dSYM; path = Carthage/Build/iOS/OCMock.framework.dSYM; sourceTree = "<group>"; };
 		5D1464341C99AC0900727339 /* Quick.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = Quick.framework.dSYM; path = Carthage/Build/iOS/Quick.framework.dSYM; sourceTree = "<group>"; };
 		5D1464351C99AC0900727339 /* OCMock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCMock.framework; path = Carthage/Build/iOS/OCMock.framework; sourceTree = "<group>"; };
-		5D3759BC1CE12E810088C60E /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = CHANGELOG.md; path = ../../CHANGELOG.md; sourceTree = "<group>"; };
-		5D3759BD1CE12E810088C60E /* DEPENDENCIES.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = DEPENDENCIES.md; path = ../../DEPENDENCIES.md; sourceTree = "<group>"; };
-		5D3759BE1CE12E810088C60E /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; name = LICENSE; path = ../../LICENSE; sourceTree = "<group>"; };
-		5D3759BF1CE12E810088C60E /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../../README.md; sourceTree = "<group>"; };
-		5D3759C01CE12E810088C60E /* SmartDeviceLink-iOS.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; name = "SmartDeviceLink-iOS.podspec"; path = "../../SmartDeviceLink-iOS.podspec"; sourceTree = "<group>"; };
+		5D1665A01CF5D5DA00CC4CA1 /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = SOURCE_ROOT; };
+		5D1665A11CF5D5DA00CC4CA1 /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = SOURCE_ROOT; };
+		5D1665A21CF5D5DA00CC4CA1 /* Cartfile.private */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cartfile.private; sourceTree = SOURCE_ROOT; };
+		5D1665A31CF5D5DA00CC4CA1 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = SOURCE_ROOT; };
+		5D1665A41CF5D5DA00CC4CA1 /* DEPENDENCIES.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = DEPENDENCIES.md; sourceTree = SOURCE_ROOT; };
+		5D1665A51CF5D5DA00CC4CA1 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = SOURCE_ROOT; };
+		5D1665A61CF5D5DA00CC4CA1 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
+		5D1665A71CF5D5DA00CC4CA1 /* SmartDeviceLink-iOS.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = "SmartDeviceLink-iOS.podspec"; sourceTree = SOURCE_ROOT; };
 		5D4019AF1A76EC350006B0C2 /* SmartDeviceLink-Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "SmartDeviceLink-Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5D4029D31A76F0340006B0C2 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = SmartDeviceLink_Example/Images.xcassets; sourceTree = SOURCE_ROOT; };
 		5D4029D51A76F0410006B0C2 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = SmartDeviceLink_Example/Info.plist; sourceTree = SOURCE_ROOT; };
@@ -2860,11 +2863,14 @@
 				5D5934EE1A85160900687FB9 /* Protocol */,
 				5D5934ED1A85160400687FB9 /* Proxy */,
 				5D61FA201A84237100846EE7 /* SmartDeviceLink.h */,
-				5D3759BC1CE12E810088C60E /* CHANGELOG.md */,
-				5D3759BD1CE12E810088C60E /* DEPENDENCIES.md */,
-				5D3759BE1CE12E810088C60E /* LICENSE */,
-				5D3759BF1CE12E810088C60E /* README.md */,
-				5D3759C01CE12E810088C60E /* SmartDeviceLink-iOS.podspec */,
+				5D1665A01CF5D5DA00CC4CA1 /* .gitignore */,
+				5D1665A11CF5D5DA00CC4CA1 /* .travis.yml */,
+				5D1665A21CF5D5DA00CC4CA1 /* Cartfile.private */,
+				5D1665A31CF5D5DA00CC4CA1 /* CHANGELOG.md */,
+				5D1665A41CF5D5DA00CC4CA1 /* DEPENDENCIES.md */,
+				5D1665A51CF5D5DA00CC4CA1 /* LICENSE */,
+				5D1665A61CF5D5DA00CC4CA1 /* README.md */,
+				5D1665A71CF5D5DA00CC4CA1 /* SmartDeviceLink-iOS.podspec */,
 				5D61FA1E1A84237100846EE7 /* Supporting Files */,
 			);
 			path = SmartDeviceLink;

SmartDeviceLink-iOS/SmartDeviceLink/Info.plist → SmartDeviceLink/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1.2</string>
+	<string>4.1.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>