Merge branch 'release-candidate' into stable

material-components · Jan 24, 2020 · e5005ca · e5005ca
2 parents 34381dd + 11139a8
commit e5005ca
Show file tree

Hide file tree

Showing 111 changed files with 857 additions and 222 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,56 @@
+# 103.0.0
+
+This major release includes a refactoring of the TextControls libraries, a theming extension for TextFields' underline controller,
+a bugfix change to Chips imagePadding handling, and the annotation of an AppBar API as to be deprecated.
+
+## API changes
+
+### TextControls+BaseTextFields
+
+**New extension.**
+
+### TextControls+Enums
+
+**New extension.**
+
+### TextControls+FilledTextFields
+
+**New extension.**
+
+### TextControls+FilledTextFieldsTheming
+
+**New extension.**
+
+### TextControls+OutlinedTextFields
+
+**New extension.**
+
+### TextControls+OutlinedTextFieldsTheming
+
+**New extension.**
+
+## Component changes
+
+### AppBar
+
+* [Annotate MDCAppBarNavigationControllerDelegate's appBarNavigationController:willAddAppBar:asChildOfViewController: as to be deprecated. (#9395)](https://github.com/material-components/material-components-ios/commit/8f80efe08d3af4643ef402f10d369f15f4eeef51) (featherless)
+
+### Chips
+
+* [Additional `imagePadding` tests. (#9441)](https://github.com/material-components/material-components-ios/commit/8377722bdb22163068e0775aea5cc39a89a35f6f) (Robert Moore)
+* [Fix `contentPadding` API. (#9440)](https://github.com/material-components/material-components-ios/commit/d1d494b0ef0fe716f9b1422830077b5552e48996) (Robert Moore)
+* [Fix `imagePadding` behavior. (#9442)](https://github.com/material-components/material-components-ios/commit/944ed3a1852e77dcf8a961e022fd18dd3645b6dc) (Robert Moore)
+
+### TextFields
+
+* [Add theming extension for underline controller (#9437)](https://github.com/material-components/material-components-ios/commit/3b3d288ea42ddcc53b61127283770f145b9def38) (Cody Weaver)
+
+## Multi-component changes
+
+* [Restructure Cocoapods and Blaze targets (#9430)](https://github.com/material-components/material-components-ios/commit/083cf8c12f8efe1d9351ddb56f513a5fed5cd289) (Andrew Overton)
+
+---
+
 # 102.0.0
 
 This major hotfix release reverts a change introduced in 101.1.0 that caused Snackbar not to appear in some situations.

diff --git a/MaterialComponents.podspec b/MaterialComponents.podspec
@@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'
 
 Pod::Spec.new do |mdc|
   mdc.name         = "MaterialComponents"
-  mdc.version      = "102.0.0"
+  mdc.version      = "103.0.0"
   mdc.authors      = "The Material Components authors."
   mdc.summary      = "A collection of stand-alone production-ready UI libraries focused on design details."
   mdc.homepage     = "https://github.com/material-components/material-components-ios"
@@ -1536,47 +1536,117 @@ Pod::Spec.new do |mdc|
     end
   end
 
-  mdc.subspec "TextControls" do |component|
+  # TextControls+Enums
+
+  mdc.subspec "TextControls+Enums" do |component|
     component.ios.deployment_target = '9.0'
-    component.public_header_files = "components/#{component.base_name}/src/*.h"
-    component.source_files = [
-      "components/#{component.base_name}/src/*.{h,m}",
-      "components/#{component.base_name}/src/private/*.{h,m}"
+    component.public_header_files = "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.h"
+    component.source_files = "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.{h,m}"
+  end
+
+  # TextControls+BaseTextFields
+
+  mdc.subspec "TextControls+BaseTextFields" do |component|
+    component.ios.deployment_target = '9.0'
+    component.public_header_files = "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.h"
+    component.source_files = [ "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.{h,m}",
+    "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/private/*.{h,m}"
     ]
 
-    component.dependency "MaterialComponents/AnimationTiming"
-    component.dependency "MaterialComponents/private/Math"
+    component.dependency "MaterialComponents/private/TextControlsPrivate+Shared"
+    component.dependency "MaterialComponents/private/TextControlsPrivate+BaseStyle"
     component.dependency "MDFInternationalization"
 
     component.test_spec 'UnitTests' do |unit_tests|
       unit_tests.source_files = [
-        "components/#{component.base_name}/tests/unit/*.{h,m,swift}",
-        "components/#{component.base_name}/tests/unit/supplemental/*.{h,m,swift}"
+      "components/#{component.base_name.split('+')[0]}/tests/unit/#{component.base_name.split('+')[1]}/*.{h,m,swift}"
       ]
-      unit_tests.resources = "components/#{component.base_name.split('+')[0]}/tests/unit/#{component.base_name.split('+')[1]}/resources/*"
+      unit_tests.dependency "MaterialComponents/schemes/Container"
     end
   end
 
-  mdc.subspec "TextControls+Theming" do |extension|
-    extension.ios.deployment_target = '9.0'
-    extension.public_header_files = "components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.h"
-    extension.source_files = [
-      "components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/*.{h,m}",
-      "components/#{extension.base_name.split('+')[0]}/src/#{extension.base_name.split('+')[1]}/private/*.{h,m}"
+  # TextControls+FilledTextFields
+
+  mdc.subspec "TextControls+FilledTextFields" do |component|
+    component.ios.deployment_target = '9.0'
+    component.public_header_files = "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.h"
+    component.source_files = [
+      "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.{h,m}",
+      "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/private/*.{h,m}"
     ]
-    extension.dependency "MaterialComponents/#{extension.base_name.split('+')[0]}"
-    extension.dependency "MaterialComponents/schemes/Color"
-    extension.dependency "MaterialComponents/schemes/Container"
-    extension.dependency "MaterialComponents/schemes/Typography"
 
-    extension.test_spec 'UnitTests' do |unit_tests|
+    component.dependency "MaterialComponents/TextControls+BaseTextFields"
+    component.dependency "MaterialComponents/private/TextControlsPrivate+FilledStyle"
+
+    component.test_spec 'UnitTests' do |unit_tests|
       unit_tests.source_files = [
-      "components/#{extension.base_name.split('+')[0]}/tests/unit/#{extension.base_name.split('+')[1]}/*.{h,m,swift}"
+      "components/#{component.base_name.split('+')[0]}/tests/unit/#{component.base_name.split('+')[1]}/*.{h,m,swift}"
+      ]
+      unit_tests.dependency "MaterialComponents/schemes/Container"
+    end
+  end
+
+  # TextControls+FilledTextFieldsTheming
+
+  mdc.subspec "TextControls+FilledTextFieldsTheming" do |component|
+    component.ios.deployment_target = '9.0'
+    component.public_header_files = "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.h"
+    component.source_files = [
+      "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.{h,m}",
+      "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/private/*.{h,m}"
+    ]
+
+    component.dependency "MaterialComponents/TextControls+FilledTextFields"
+    component.dependency "MaterialComponents/schemes/Container"
+
+    component.test_spec 'UnitTests' do |unit_tests|
+      unit_tests.source_files = [
+      "components/#{component.base_name.split('+')[0]}/tests/unit/#{component.base_name.split('+')[1]}/*.{h,m,swift}"
+      ]
+    end
+  end
+
+  # TextControls+OutlinedTextFields
+
+  mdc.subspec "TextControls+OutlinedTextFields" do |component|
+    component.ios.deployment_target = '9.0'
+    component.public_header_files = "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.h"
+    component.source_files = [
+      "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.{h,m}",
+      "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/private/*.{h,m}"
+    ]
+
+    component.dependency "MaterialComponents/TextControls+BaseTextFields"
+    component.dependency "MaterialComponents/private/TextControlsPrivate+OutlinedStyle"
+
+    component.test_spec 'UnitTests' do |unit_tests|
+      unit_tests.source_files = [
+      "components/#{component.base_name.split('+')[0]}/tests/unit/#{component.base_name.split('+')[1]}/*.{h,m,swift}"
       ]
       unit_tests.dependency "MaterialComponents/schemes/Container"
     end
   end
 
+  # TextControls+OutlinedTextFieldsTheming
+
+  mdc.subspec "TextControls+OutlinedTextFieldsTheming" do |component|
+    component.ios.deployment_target = '9.0'
+    component.public_header_files = "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.h"
+    component.source_files = [
+      "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.{h,m}",
+      "components/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/private/*.{h,m}"
+    ]
+
+    component.dependency "MaterialComponents/TextControls+OutlinedTextFields"
+    component.dependency "MaterialComponents/schemes/Container"
+
+    component.test_spec 'UnitTests' do |unit_tests|
+      unit_tests.source_files = [
+      "components/#{component.base_name.split('+')[0]}/tests/unit/#{component.base_name.split('+')[1]}/*.{h,m,swift}"
+      ]
+    end
+  end
+
   mdc.subspec "TextFields+ColorThemer" do |extension|
     extension.ios.deployment_target = '9.0'
     extension.public_header_files = [
@@ -1803,7 +1873,6 @@ Pod::Spec.new do |mdc|
       component.ios.deployment_target = '9.0'
       component.public_header_files = "components/private/#{component.base_name}/src/*.h"
       component.source_files = "components/private/#{component.base_name}/src/*.{h,m}"
-
       component.test_spec 'UnitTests' do |unit_tests|
         unit_tests.source_files = [
           "components/private/#{component.base_name}/tests/unit/*.{h,m,swift}",
@@ -1830,6 +1899,47 @@ Pod::Spec.new do |mdc|
       end
     end
 
+    private_spec.subspec "TextControlsPrivate+Shared" do |component|
+      component.ios.deployment_target = '9.0'
+      component.public_header_files = "components/private/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.h"
+      component.source_files = [ "components/private/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.{h,m}"
+      ]
+      component.dependency "MaterialComponents/TextControls+Enums"
+      component.dependency "MaterialComponents/AnimationTiming"
+      component.dependency "MaterialComponents/private/Math"
+    end
+
+    private_spec.subspec "TextControlsPrivate+BaseStyle" do |component|
+      component.ios.deployment_target = '9.0'
+      component.public_header_files = "components/private/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.h"
+      component.source_files = [ "components/private/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.{h,m}"
+      ]
+      component.dependency "MaterialComponents/private/TextControlsPrivate+Shared"
+      component.dependency "MaterialComponents/AnimationTiming"
+      component.dependency "MaterialComponents/private/Math"
+    end
+
+    private_spec.subspec "TextControlsPrivate+FilledStyle" do |component|
+      component.ios.deployment_target = '9.0'
+      component.public_header_files = "components/private/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.h"
+      component.source_files = [ "components/private/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.{h,m}"
+      ]
+
+      component.dependency "MaterialComponents/private/TextControlsPrivate+Shared"
+      component.dependency "MaterialComponents/AnimationTiming"
+      component.dependency "MaterialComponents/private/Math"
+    end
+
+    private_spec.subspec "TextControlsPrivate+OutlinedStyle" do |component|
+      component.ios.deployment_target = '9.0'
+      component.public_header_files = "components/private/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.h"
+      component.source_files = [ "components/private/#{component.base_name.split('+')[0]}/src/#{component.base_name.split('+')[1]}/*.{h,m}"
+      ]
+      component.dependency "MaterialComponents/private/TextControlsPrivate+Shared"
+      component.dependency "MaterialComponents/AnimationTiming"
+      component.dependency "MaterialComponents/private/Math"
+    end
+
     private_spec.subspec "ThumbTrack" do |component|
       component.ios.deployment_target = '9.0'
       component.public_header_files = "components/private/#{component.base_name}/src/*.h"

diff --git a/MaterialComponentsBeta.podspec b/MaterialComponentsBeta.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |mdc|
   mdc.name         = "MaterialComponentsBeta"
-  mdc.version      = "102.0.0"
+  mdc.version      = "103.0.0"
   mdc.authors      = "The Material Components authors."
   mdc.summary      = "A collection of stand-alone alpha UI libraries that are not yet guaranteed to be ready for general production use. Use with caution."
   mdc.homepage     = "https://github.com/material-components/material-components-ios"

diff --git a/MaterialComponentsEarlGreyTests.podspec b/MaterialComponentsEarlGreyTests.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsEarlGreyTests"
-  s.version      = "102.0.0"
+  s.version      = "103.0.0"
   s.authors      = "The Material Components authors."
   s.summary      = "This spec is an aggregate of all the Material Components EarlGrey tests."
   s.description  = "This spec is made for use in the MDC Catalog."

diff --git a/MaterialComponentsExamples.podspec b/MaterialComponentsExamples.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsExamples"
-  s.version      = "102.0.0"
+  s.version      = "103.0.0"
   s.authors      = "The Material Components authors."
   s.summary      = "This spec is an aggregate of all the Material Components examples."
   s.description  = "This spec is made for use in the MDC Catalog. Used in conjunction with CatalogByConvention we create our Material Catalog."

diff --git a/MaterialComponentsSnapshotTests.podspec b/MaterialComponentsSnapshotTests.podspec
@@ -53,7 +53,7 @@ end
 
 Pod::Spec.new do |s|
   s.name         = "MaterialComponentsSnapshotTests"
-  s.version      = "102.0.0"
+  s.version      = "103.0.0"
   s.authors      = "The Material Components authors."
   s.summary      = "This spec is an aggregate of all the Material Components snapshot tests."
   s.homepage     = "https://github.com/material-components/material-components-ios"

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-102.0.0
+103.0.0
diff --git a/catalog/MDCCatalog/Info.plist b/catalog/MDCCatalog/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>102.0.0</string>
+	<string>103.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>102.0.0</string>
+	<string>103.0.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIAppFonts</key>

diff --git a/catalog/MDCDragons/Info.plist b/catalog/MDCDragons/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>102.0.0</string>
+	<string>103.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>102.0.0</string>
+	<string>103.0.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

diff --git a/catalog/MaterialCatalog/MaterialCatalog.podspec b/catalog/MaterialCatalog/MaterialCatalog.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MaterialCatalog"
-  s.version      = "102.0.0"
+  s.version      = "103.0.0"
   s.summary      = "Helper Objective-C classes for the MDC catalog."
   s.description  = "This spec is made for use in the MDC Catalog."
   s.homepage     = "https://github.com/material-components/material-components-ios"

diff --git a/catalog/Podfile b/catalog/Podfile
@@ -70,9 +70,12 @@ target "MDCCatalog" do
     'Tabs/UnitTests',
     'Tabs+Theming/UnitTests',
     'TextFields/UnitTests',
-    'TextControls/UnitTests',
-    'TextControls+Theming/UnitTests',
     'TextFields+Theming/UnitTests',
+    'TextControls+BaseTextFields/UnitTests',
+    'TextControls+FilledTextFields/UnitTests',
+    'TextControls+FilledTextFieldsTheming/UnitTests',
+    'TextControls+OutlinedTextFields/UnitTests',
+    'TextControls+OutlinedTextFieldsTheming/UnitTests',
     'Themes/UnitTests',
     'Typography/UnitTests',
   ]