Merge branch 'release-candidate'

Author: Ian Gordon

.travis.yml

@@ -1,17 +1,17 @@
 language: objective-c
-osx_image: xcode7.3
+osx_image: xcode8.2
 sudo: false
 # Only fire off builds for specific branches.
 branches:
   only:
-    - master
+    - develop
+    - stable
 env:
   global:
   - LC_CTYPE=en_US.UTF-8
   - LANG=en_US.UTF-8
   matrix:
-    - DESTINATION="OS=9.3,name=iPhone 6s" SDK=iphonesimulator9.3
-    - DESTINATION="OS=8.1,name=iPhone 4S" SDK=iphonesimulator9.3
+    - DESTINATION="platform=iOS Simulator,name=iPhone 7,OS=10.1" SDK="iphonesimulator10.2"
 before_install:
   - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
 script:

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.2.0
+
+### Enhancements
+
+* Add tvOS as a target plaform.
+
 ## 1.1.4
 
 ### Enhancements
@@ -50,7 +56,7 @@ Initial release.
 
 ## x.x.x
 
-This is a template. When cutting a new release, rename "master" to the release number and create a
+This is a template. When cutting a new release, rename "stable" to the release number and create a
 new, empty "Master" section.
 
 ### Breaking

MDFTextAccessibility.podspec

@@ -1,14 +1,16 @@
 Pod::Spec.new do |spec|
   spec.name         = "MDFTextAccessibility"
-  spec.version      = "1.1.4"
+  spec.version      = "1.2.0"
   spec.summary      = "MDFTextAccessibility assists in selecting text colors that meet the W3C standards for accessibility."
   spec.homepage     = "https://github.com/google/material-text-accessibility-ios"
   spec.license      = "Apache License, Version 2.0"
   spec.authors      = "Google Inc."
   spec.source       = { :git => "https://github.com/google/material-text-accessibility-ios.git", :tag => "v#{spec.version}" }
-  spec.platform     = :ios
+  spec.platform     = :ios,:tvos
   spec.source_files = "src/*.{h,m}", "src/private/*.{h,m}"
   spec.public_header_files = "src/MDFTextAccessibility.h"
   spec.private_header_files = "src/private/*.h"
   spec.header_dir   = "MDFTextAccessibility"
+  spec.ios.deployment_target = '8.0'
+  spec.tvos.deployment_target = '9.0'
 end

MDFTextAccessibility.xcodeproj/project.pbxproj

@@ -217,9 +217,11 @@
 				TargetAttributes = {
 					0B2890DE1CE2730C009E605A = {
 						CreatedOnToolsVersion = 7.3;
+						LastSwiftMigration = 0800;
 					};
 					0BDAE3DF1CECD3A6003323B9 = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -361,6 +363,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "tests/unit/MDFTextAccessibility-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -409,6 +412,7 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "tests/unit/MDFTextAccessibility-Bridging-Header.h";
+				SWIFT_VERSION = 3.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -465,6 +469,7 @@
 				SWIFT_INCLUDE_PATHS = src;
 				SWIFT_OBJC_BRIDGING_HEADER = "src/MDFTextAccessibility-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -512,6 +517,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_INCLUDE_PATHS = src;
 				SWIFT_OBJC_BRIDGING_HEADER = "src/MDFTextAccessibility-Bridging-Header.h";
+				SWIFT_VERSION = 3.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;

README.md

@@ -1,8 +1,8 @@
 MDFTextAccessibility assists in selecting text colors that will meet the
 [W3C standards for accessibility](https://www.w3.org/TR/UNDERSTANDING-WCAG20/visual-audio-contrast-contrast.html).
 
-[![Build Status](https://travis-ci.org/material-foundation/material-text-accessibility-ios.svg?branch=master)](https://travis-ci.org/material-foundation/material-text-accessibility-ios)
-[![Code Coverage](http://codecov.io/github/material-foundation/material-text-accessibility-ios/coverage.svg?branch=master)](http://codecov.io/github/material-foundation/material-text-accessibility-ios?branch=master)
+[![Build Status](https://travis-ci.org/material-foundation/material-text-accessibility-ios.svg?branch=develop)](https://travis-ci.org/material-foundation/material-text-accessibility-ios)
+[![Code Coverage](http://codecov.io/github/material-foundation/material-text-accessibility-ios/coverage.svg?branch=develop)](http://codecov.io/github/material-foundation/material-text-accessibility-ios?branch=develop)
 
 *May 24, 2016: We're still staging MDFTextAccessibility, feel free to poke
 around, but non-code things like CocoaPods support and continuous integration

examples/apps/MDFTextAccessibilitySample/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - MDFTextAccessibility (1.1.4)
+  - MDFTextAccessibility (1.2.0)
 
 DEPENDENCIES:
   - MDFTextAccessibility (from `../../..`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../../.."
 
 SPEC CHECKSUMS:
-  MDFTextAccessibility: aa897b2675bc614c01a331053af680deea692148
+  MDFTextAccessibility: 94098925e0853551c5a311ce7c1ecefbe297cdb6
 
 PODFILE CHECKSUM: ba1d198039c6b887cc904c2b80f4ae8bc213c6fd
 
-COCOAPODS: 1.1.1
+COCOAPODS: 1.2.0

src/MDFTextAccessibility.h

@@ -189,6 +189,7 @@ typedef NS_OPTIONS(NSUInteger, MDFTextAccessibilityOptions) {
 
  Large fonts are defined as greater than 18pt normal or 14pt bold. If the passed font is nil, then
  this method returns NO.
+ For more see: https://www.w3.org/TR/UNDERSTANDING-WCAG20/visual-audio-contrast-contrast.html
 
  @param font The font to examine, or nil.
  @return YES if the font is non-nil and is considered "large".