diff --git a/.swiftlint.yml b/.swiftlint.yml index a453e88..85e6806 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -1,6 +1,5 @@ opt_in_rules: - empty_count - #- missing_docs - force_unwrapping - overridden_super_call - redundant_nil_coalescing @@ -14,6 +13,7 @@ disabled_rules: - line_length - function_body_length - type_body_length + - switch_case_alignment identifier_name: excluded: diff --git a/.travis.yml b/.travis.yml index b28989c..d72183c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,13 @@ env: - DESTINATION='platform=iOS Simulator,name=iPhone 6s Plus' - DESTINATION='platform=iOS Simulator,name=iPhone 7' - DESTINATION='platform=iOS Simulator,name=iPhone 7 Plus' + - DESTINATION='platform=iOS Simulator,name=iPhone 8' + - DESTINATION='platform=iOS Simulator,name=iPhone 8 Plus' - DESTINATION='platform=iOS Simulator,name=iPhone SE' + - DESTINATION='platform=iOS Simulator,name=iPhone X' - - DESTINATION='platform=tvOS Simulator,name=Apple TV 1080p' + - DESTINATION='platform=tvOS Simulator,name=Apple TV' + - DESTINATION='platform=tvOS Simulator,name=Apple TV 4K' install: - bundle install diff --git a/DeviceKit.podspec b/DeviceKit.podspec index 40acc48..51d93f7 100644 --- a/DeviceKit.podspec +++ b/DeviceKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'DeviceKit' - s.version = '1.4.0' + s.version = '1.5.0' s.summary = 'DeviceKit is a ยต-framework that provides a value-type replacement of UIDevice.' s.description = <<-DESC diff --git a/DeviceKit.xcodeproj/project.pbxproj b/DeviceKit.xcodeproj/project.pbxproj index 01d7277..09d67a4 100644 --- a/DeviceKit.xcodeproj/project.pbxproj +++ b/DeviceKit.xcodeproj/project.pbxproj @@ -383,7 +383,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_INSTALL_OBJC_HEADER = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; TARGETED_DEVICE_FAMILY = "1,2,3"; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; @@ -433,7 +433,7 @@ SKIP_INSTALL = YES; SWIFT_INSTALL_OBJC_HEADER = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; TARGETED_DEVICE_FAMILY = "1,2,3"; TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; @@ -480,7 +480,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OBJC_INTERFACE_HEADER_NAME = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; }; name = Debug; }; @@ -516,7 +516,7 @@ SDKROOT = iphoneos; SWIFT_OBJC_INTERFACE_HEADER_NAME = ""; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; VALIDATE_PRODUCT = YES; }; name = Release; diff --git a/README.md b/README.md index 9635c42..b7e5a3f 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,10 @@ DeviceKit can be installed in various ways. ### CocoaPods +#### Swift 4 +```ruby +pod 'DeviceKit', '~> 1.3.0' +``` #### Swift 3 ```ruby pod 'DeviceKit', '~> 1.0' @@ -47,6 +51,10 @@ pod 'DeviceKit', :git => 'https://github.com/dennisweissmann/DeviceKit.git', :br ### Carthage +#### Swift 4 +```ogdl +github "dennisweissmann/DeviceKit" ~> 1.3.0 +``` #### Swift 3 ```ogdl github "dennisweissmann/DeviceKit" ~> 1.0 @@ -183,12 +191,14 @@ The following people (in alphabetical order) contributed to this project - it wo - [chappieee](https://github.com/chappieee) - [Rui Costa](https://github.com/ruipfcosta) - [elgordino](https://github.com/elgordino) +- [Martin Imobersteg](https://github.com/bugix) - [Genie Jhang](https://github.com/geniejhang) - [Steve Moser](https://github.com/stevemoser) - [Juan Carlos Ospina Gonzalez](https://github.com/piterwilson) - [phiren](https://github.com/phiren) - [Prakash Rajendran](https://github.com/dearprakash) - [Trey Richards](https://github.com/treyrich) +- [Gianpiero Spinelli](https://github.com/gianpispi) - [Tillman Swinke](https://github.com/tswinke) - [Kraig Wastlund](https://github.com/KraigWastlund) - [Kaden Wilkinson](https://github.com/kdawgwilk) diff --git a/Source/Device.generated.swift b/Source/Device.generated.swift index 2e5858e..0f715c6 100644 --- a/Source/Device.generated.swift +++ b/Source/Device.generated.swift @@ -551,6 +551,7 @@ public enum Device { #endif } + /// The brightness level of the screen. public var screenBrightness: Int { #if os(iOS) return Int(UIScreen.main.brightness * 100) diff --git a/Source/Info.plist b/Source/Info.plist index 8bce5c7..beed82a 100644 --- a/Source/Info.plist +++ b/Source/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.4.0 + 1.5.0 CFBundleSignature ???? CFBundleVersion