Skip to content
This repository was archived by the owner on Dec 11, 2025. It is now read-only.

Commit 5ba368f

Browse files
author
Ian Gordon
committed
Merge branch 'release-candidate'
2 parents bdc034d + c8ca6f3 commit 5ba368f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+881
-330
lines changed

‎CHANGELOG.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
# 12.0.1
2+
3+
## API diffs
4+
5+
Auto-generated by running:
6+
7+
scripts/api_diff -o bdc034da8700a9cbd6064823dc045b511d622f8c -n f9f6d8e87d6cdaf884ac2d3ad462403bdb2fd008
8+
9+
No public API changes detected.
10+
11+
## Component changes
12+
13+
### CollectionCells
14+
15+
#### Changes
16+
17+
* [Resize the content view when there is an accessory view.](https://github.com/google/material-components-ios/commit/f6d329602f84cc0839ebdfa622877d70201fd798) (Louis Romero)
18+
19+
### Slider
20+
21+
#### Changes
22+
23+
* [Add discrete positions when editing](https://github.com/google/material-components-ios/commit/7c0d0a654f030b3e3f2d1136f7415a4caa92917c) (Max Luzuriaga)
24+
25+
### Snackbar
26+
27+
#### Changes
28+
29+
* [Add legal info to snackbar files and umbrella header for keyboard watcher](https://github.com/google/material-components-ios/commit/be579f15da376d1029b4bef2abdf5cdd9c65c891) (Junius Gunaratne)
30+
* [Don't force uppercasing of the button.](https://github.com/google/material-components-ios/commit/f9f6d8e87d6cdaf884ac2d3ad462403bdb2fd008) (Louis Romero)
31+
132
# 12.0.0
233

334
## API diffs

‎MaterialComponents.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ load 'scripts/generated/icons.rb'
22

33
Pod::Spec.new do |s|
44
s.name = "MaterialComponents"
5-
s.version = "12.0.0"
5+
s.version = "12.0.1"
66
s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
77
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
88
s.homepage = "https://github.com/google/material-components-ios"

‎MaterialComponentsCatalog.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "MaterialComponentsCatalog"
3-
s.version = "12.0.0"
3+
s.version = "12.0.1"
44
s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
55
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
66
s.homepage = "https://github.com/google/material-components-ios"

‎MaterialComponentsUnitTests.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "MaterialComponentsUnitTests"
3-
s.version = "12.0.0"
3+
s.version = "12.0.1"
44
s.authors = { 'Apple platform engineering at Google' => 'appleplatforms@google.com' }
55
s.summary = "A collection of stand-alone production-ready UI libraries focused on design details."
66
s.homepage = "https://github.com/google/material-components-ios"

‎catalog/CatalogByConvention/example/catalog/Catalog.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
isa = PBXNativeTarget;
9090
buildConfigurationList = 666CA6C31CAE277E001B1884 /* Build configuration list for PBXNativeTarget "Catalog" */;
9191
buildPhases = (
92-
A6D4D34D01155E957863CFC5 /* 📦 Check Pods Manifest.lock */,
92+
A6D4D34D01155E957863CFC5 /* [CP] Check Pods Manifest.lock */,
9393
5E0C759D6BF372D69AB4361F /* [CP] Check Pods Manifest.lock */,
9494
666CA6AD1CAE277E001B1884 /* Sources */,
9595
666CA6AE1CAE277E001B1884 /* Frameworks */,
@@ -199,14 +199,14 @@
199199
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Catalog/Pods-Catalog-resources.sh\"\n";
200200
showEnvVarsInLog = 0;
201201
};
202-
A6D4D34D01155E957863CFC5 /* 📦 Check Pods Manifest.lock */ = {
202+
A6D4D34D01155E957863CFC5 /* [CP] Check Pods Manifest.lock */ = {
203203
isa = PBXShellScriptBuildPhase;
204204
buildActionMask = 2147483647;
205205
files = (
206206
);
207207
inputPaths = (
208208
);
209-
name = "📦 Check Pods Manifest.lock";
209+
name = "[CP] Check Pods Manifest.lock";
210210
outputPaths = (
211211
);
212212
runOnlyForDeploymentPostprocessing = 0;

‎catalog/CatalogByConvention/example/catalog/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ SPEC CHECKSUMS:
2828

2929
PODFILE CHECKSUM: f14a477885bb971999b5fa8afb20a539b2bcabdc
3030

31-
COCOAPODS: 1.0.0
31+
COCOAPODS: 1.0.1

‎catalog/CatalogByConvention/example/catalog/UnitTests.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
isa = PBXNativeTarget;
8484
buildConfigurationList = 666CA7001CAE34F0001B1884 /* Build configuration list for PBXNativeTarget "UnitTests" */;
8585
buildPhases = (
86-
620E23DD0839D796E051E613 /* 📦 Check Pods Manifest.lock */,
86+
620E23DD0839D796E051E613 /* [CP] Check Pods Manifest.lock */,
8787
3DF90DBC96265E81B0B0A3BB /* [CP] Check Pods Manifest.lock */,
8888
666CA6F41CAE34F0001B1884 /* Sources */,
8989
666CA6F51CAE34F0001B1884 /* Frameworks */,
@@ -159,14 +159,14 @@
159159
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
160160
showEnvVarsInLog = 0;
161161
};
162-
620E23DD0839D796E051E613 /* 📦 Check Pods Manifest.lock */ = {
162+
620E23DD0839D796E051E613 /* [CP] Check Pods Manifest.lock */ = {
163163
isa = PBXShellScriptBuildPhase;
164164
buildActionMask = 2147483647;
165165
files = (
166166
);
167167
inputPaths = (
168168
);
169-
name = "📦 Check Pods Manifest.lock";
169+
name = "[CP] Check Pods Manifest.lock";
170170
outputPaths = (
171171
);
172172
runOnlyForDeploymentPostprocessing = 0;

‎catalog/MDCCatalog.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -263,12 +263,12 @@
263263
isa = PBXNativeTarget;
264264
buildConfigurationList = 664524C51C6BA62A001ADBF8 /* Build configuration list for PBXNativeTarget "MDCCatalog" */;
265265
buildPhases = (
266-
D34F9C3373AD1979FBA3F8E0 /* 📦 Check Pods Manifest.lock */,
266+
D34F9C3373AD1979FBA3F8E0 /* [CP] Check Pods Manifest.lock */,
267267
664524AF1C6BA62A001ADBF8 /* Sources */,
268268
664524B01C6BA62A001ADBF8 /* Frameworks */,
269269
664524B11C6BA62A001ADBF8 /* Resources */,
270-
72ACDAA295D1F2087113246F /* 📦 Embed Pods Frameworks */,
271-
8164F6F5D8C80F373A698031 /* 📦 Copy Pods Resources */,
270+
72ACDAA295D1F2087113246F /* [CP] Embed Pods Frameworks */,
271+
8164F6F5D8C80F373A698031 /* [CP] Copy Pods Resources */,
272272
);
273273
buildRules = (
274274
);
@@ -359,44 +359,44 @@
359359
/* End PBXResourcesBuildPhase section */
360360

361361
/* Begin PBXShellScriptBuildPhase section */
362-
72ACDAA295D1F2087113246F /* 📦 Embed Pods Frameworks */ = {
362+
72ACDAA295D1F2087113246F /* [CP] Embed Pods Frameworks */ = {
363363
isa = PBXShellScriptBuildPhase;
364364
buildActionMask = 2147483647;
365365
files = (
366366
);
367367
inputPaths = (
368368
);
369-
name = "📦 Embed Pods Frameworks";
369+
name = "[CP] Embed Pods Frameworks";
370370
outputPaths = (
371371
);
372372
runOnlyForDeploymentPostprocessing = 0;
373373
shellPath = /bin/sh;
374374
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MDCCatalog/Pods-MDCCatalog-frameworks.sh\"\n";
375375
showEnvVarsInLog = 0;
376376
};
377-
8164F6F5D8C80F373A698031 /* 📦 Copy Pods Resources */ = {
377+
8164F6F5D8C80F373A698031 /* [CP] Copy Pods Resources */ = {
378378
isa = PBXShellScriptBuildPhase;
379379
buildActionMask = 2147483647;
380380
files = (
381381
);
382382
inputPaths = (
383383
);
384-
name = "📦 Copy Pods Resources";
384+
name = "[CP] Copy Pods Resources";
385385
outputPaths = (
386386
);
387387
runOnlyForDeploymentPostprocessing = 0;
388388
shellPath = /bin/sh;
389389
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MDCCatalog/Pods-MDCCatalog-resources.sh\"\n";
390390
showEnvVarsInLog = 0;
391391
};
392-
D34F9C3373AD1979FBA3F8E0 /* 📦 Check Pods Manifest.lock */ = {
392+
D34F9C3373AD1979FBA3F8E0 /* [CP] Check Pods Manifest.lock */ = {
393393
isa = PBXShellScriptBuildPhase;
394394
buildActionMask = 2147483647;
395395
files = (
396396
);
397397
inputPaths = (
398398
);
399-
name = "📦 Check Pods Manifest.lock";
399+
name = "[CP] Check Pods Manifest.lock";
400400
outputPaths = (
401401
);
402402
runOnlyForDeploymentPostprocessing = 0;

‎catalog/MDCUnitTests.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@
8383
isa = PBXNativeTarget;
8484
buildConfigurationList = 66CB71311C853DB30099B932 /* Build configuration list for PBXNativeTarget "MDCUnitTests" */;
8585
buildPhases = (
86-
3AAA6E9A4CDB1D9185BBE3C9 /* 📦 Check Pods Manifest.lock */,
86+
3AAA6E9A4CDB1D9185BBE3C9 /* [CP] Check Pods Manifest.lock */,
8787
66CB71281C853DB30099B932 /* Sources */,
8888
66CB71291C853DB30099B932 /* Frameworks */,
8989
66CB712A1C853DB30099B932 /* Resources */,
90-
F9D78476FD8A80F052AA9626 /* 📦 Embed Pods Frameworks */,
91-
AE724C5C2CA008AFD7432821 /* 📦 Copy Pods Resources */,
90+
F9D78476FD8A80F052AA9626 /* [CP] Embed Pods Frameworks */,
91+
AE724C5C2CA008AFD7432821 /* [CP] Copy Pods Resources */,
9292
);
9393
buildRules = (
9494
);
@@ -141,44 +141,44 @@
141141
/* End PBXResourcesBuildPhase section */
142142

143143
/* Begin PBXShellScriptBuildPhase section */
144-
3AAA6E9A4CDB1D9185BBE3C9 /* 📦 Check Pods Manifest.lock */ = {
144+
3AAA6E9A4CDB1D9185BBE3C9 /* [CP] Check Pods Manifest.lock */ = {
145145
isa = PBXShellScriptBuildPhase;
146146
buildActionMask = 2147483647;
147147
files = (
148148
);
149149
inputPaths = (
150150
);
151-
name = "📦 Check Pods Manifest.lock";
151+
name = "[CP] Check Pods Manifest.lock";
152152
outputPaths = (
153153
);
154154
runOnlyForDeploymentPostprocessing = 0;
155155
shellPath = /bin/sh;
156156
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
157157
showEnvVarsInLog = 0;
158158
};
159-
AE724C5C2CA008AFD7432821 /* 📦 Copy Pods Resources */ = {
159+
AE724C5C2CA008AFD7432821 /* [CP] Copy Pods Resources */ = {
160160
isa = PBXShellScriptBuildPhase;
161161
buildActionMask = 2147483647;
162162
files = (
163163
);
164164
inputPaths = (
165165
);
166-
name = "📦 Copy Pods Resources";
166+
name = "[CP] Copy Pods Resources";
167167
outputPaths = (
168168
);
169169
runOnlyForDeploymentPostprocessing = 0;
170170
shellPath = /bin/sh;
171171
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MDCUnitTests/Pods-MDCUnitTests-resources.sh\"\n";
172172
showEnvVarsInLog = 0;
173173
};
174-
F9D78476FD8A80F052AA9626 /* 📦 Embed Pods Frameworks */ = {
174+
F9D78476FD8A80F052AA9626 /* [CP] Embed Pods Frameworks */ = {
175175
isa = PBXShellScriptBuildPhase;
176176
buildActionMask = 2147483647;
177177
files = (
178178
);
179179
inputPaths = (
180180
);
181-
name = "📦 Embed Pods Frameworks";
181+
name = "[CP] Embed Pods Frameworks";
182182
outputPaths = (
183183
);
184184
runOnlyForDeploymentPostprocessing = 0;

0 commit comments

Comments
 (0)