Skip to content

Commit

Permalink
Merge pull request #12 from dennisweissmann/CarPlay-UserInterfaceIdiom
Browse files Browse the repository at this point in the history
added support for CarPlay InterfaceIdiom
  • Loading branch information
dennisweissmann committed Feb 20, 2016
2 parents a9c5c5a + 7e73abf commit 56b3fcf
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 16 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode7.2
osx_image: xcode7.3

env:
global:
Expand All @@ -9,10 +9,10 @@ env:
- IOS_FRAMEWORK_SCHEME="DeviceKit-iOS"
- OSX_FRAMEWORK_SCHEME="DeviceKit-OSX"
- TVOS_FRAMEWORK_SCHEME="DeviceKit-tvOS"
- IOS_SDK=iphonesimulator9.2
- IOS_SDK=iphonesimulator9.3
- OSX_SDK=macosx10.11
- TVOS_SDK=appletvsimulator9.1
- WATCHOS_SDK=watchsimulator2.1
- TVOS_SDK=appletvsimulator9.2
- WATCHOS_SDK=watchsimulator2.2
matrix:
- DESTINATION="OS=9.1,name=iPhone 4S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" POD_LINT="YES"
- DESTINATION="OS=9.1,name=iPhone 5" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" POD_LINT="NO"
Expand All @@ -38,4 +38,4 @@ script:
# Run `pod lib lint` if specified
- if [ $POD_LINT == "YES" ]; then
pod lib lint;
fi
fi
2 changes: 1 addition & 1 deletion DeviceKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'DeviceKit'
s.version = '0.3.0'
s.version = '0.3.1'
s.summary = 'DeviceKit is a µ-framework that provides a value-type replacement of UIDevice.'

s.description = <<-DESC
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
## Requirements

- iOS 8.0+ / tvOS 9.0+
- Xcode 7.2+
- Xcode 7.3+

## Installation
DeviceKit can be installed in various ways.
Expand All @@ -30,13 +30,13 @@ source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.0'
use_frameworks!

pod 'DeviceKit', '~> 0.3.0'
pod 'DeviceKit', '~> 0.3.1'
```

### Carthage

```ogdl
github "dennisweissmann/DeviceKit" ~> 0.3.0
github "dennisweissmann/DeviceKit" ~> 0.3.1
```

### Manually
Expand Down
9 changes: 3 additions & 6 deletions Source/Device.swift
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,8 @@ public enum Device {
case Pad
/// The user interface should be designed for TV
case TV
/// The user interface should be designed for Car
case CarPlay
/// Used when an object has a trait collection, but it is not in an environment yet. For example, a view that is created, but not put into a view hierarchy.
case Unspecified

Expand All @@ -347,6 +349,7 @@ public enum Device {
case .Pad: self = .Pad
case .Phone: self = .Phone
case .TV: self = .TV
case .CarPlay: self = .CarPlay
case .Unspecified: self = .Unspecified
}
}
Expand Down Expand Up @@ -378,12 +381,6 @@ public enum Device {
return UIDevice.currentDevice().localizedModel
}

/// The model of the device including the generation (if != 1).
@available(*, deprecated=0.2.0, obsoleted=0.3.0, message="Use `description` instead.")
public var detailedModel: String {
return description
}

}

// MARK: - CustomStringConvertible
Expand Down
2 changes: 1 addition & 1 deletion Source/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.3.0</string>
<string>0.3.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down

0 comments on commit 56b3fcf

Please sign in to comment.