Skip to content
This repository was archived by the owner on Sep 27, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions catalog/MDCCatalog.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
A7D47BD9A3C62120038127E5 /* [CP] Copy Pods Resources */ = {
Expand Down Expand Up @@ -561,7 +561,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down
2 changes: 1 addition & 1 deletion catalog/MDCUnitTests.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
AE724C5C2CA008AFD7432821 /* [CP] Copy Pods Resources */ = {
Expand Down
192 changes: 98 additions & 94 deletions catalog/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,39 +1,40 @@
PODS:
- CatalogByConvention (1.0.1)
- EarlGrey (1.3.0)
- MaterialComponents (15.0.0):
- MaterialComponents/ActivityIndicator (= 15.0.0)
- MaterialComponents/AnimationTiming (= 15.0.0)
- MaterialComponents/AppBar (= 15.0.0)
- MaterialComponents/ButtonBar (= 15.0.0)
- MaterialComponents/Buttons (= 15.0.0)
- MaterialComponents/CollectionCells (= 15.0.0)
- MaterialComponents/CollectionLayoutAttributes (= 15.0.0)
- MaterialComponents/Collections (= 15.0.0)
- MaterialComponents/Dialogs (= 15.0.0)
- MaterialComponents/FlexibleHeader (= 15.0.0)
- MaterialComponents/FontDiskLoader (= 15.0.0)
- MaterialComponents/HeaderStackView (= 15.0.0)
- MaterialComponents/Ink (= 15.0.0)
- MaterialComponents/NavigationBar (= 15.0.0)
- MaterialComponents/OverlayWindow (= 15.0.0)
- MaterialComponents/PageControl (= 15.0.0)
- MaterialComponents/Palettes (= 15.0.0)
- MaterialComponents/private (= 15.0.0)
- MaterialComponents/ProgressView (= 15.0.0)
- MaterialComponents/RobotoFontLoader (= 15.0.0)
- MaterialComponents/ShadowElevations (= 15.0.0)
- MaterialComponents/ShadowLayer (= 15.0.0)
- MaterialComponents/Slider (= 15.0.0)
- MaterialComponents/Snackbar (= 15.0.0)
- MaterialComponents/SpritedAnimationView (= 15.0.0)
- MaterialComponents/Switch (= 15.0.0)
- MaterialComponents/Tabs (= 15.0.0)
- MaterialComponents/Typography (= 15.0.0)
- MaterialComponents/ActivityIndicator (15.0.0):
- MaterialComponents (16.2.0):
- MaterialComponents/ActivityIndicator (= 16.2.0)
- MaterialComponents/AnimationTiming (= 16.2.0)
- MaterialComponents/AppBar (= 16.2.0)
- MaterialComponents/ButtonBar (= 16.2.0)
- MaterialComponents/Buttons (= 16.2.0)
- MaterialComponents/CollectionCells (= 16.2.0)
- MaterialComponents/CollectionLayoutAttributes (= 16.2.0)
- MaterialComponents/Collections (= 16.2.0)
- MaterialComponents/Dialogs (= 16.2.0)
- MaterialComponents/FeatureHighlight (= 16.2.0)
- MaterialComponents/FlexibleHeader (= 16.2.0)
- MaterialComponents/FontDiskLoader (= 16.2.0)
- MaterialComponents/HeaderStackView (= 16.2.0)
- MaterialComponents/Ink (= 16.2.0)
- MaterialComponents/NavigationBar (= 16.2.0)
- MaterialComponents/OverlayWindow (= 16.2.0)
- MaterialComponents/PageControl (= 16.2.0)
- MaterialComponents/Palettes (= 16.2.0)
- MaterialComponents/private (= 16.2.0)
- MaterialComponents/ProgressView (= 16.2.0)
- MaterialComponents/RobotoFontLoader (= 16.2.0)
- MaterialComponents/ShadowElevations (= 16.2.0)
- MaterialComponents/ShadowLayer (= 16.2.0)
- MaterialComponents/Slider (= 16.2.0)
- MaterialComponents/Snackbar (= 16.2.0)
- MaterialComponents/SpritedAnimationView (= 16.2.0)
- MaterialComponents/Switch (= 16.2.0)
- MaterialComponents/Tabs (= 16.2.0)
- MaterialComponents/Typography (= 16.2.0)
- MaterialComponents/ActivityIndicator (16.2.0):
- MaterialComponents/private/RTL
- MaterialComponents/AnimationTiming (15.0.0)
- MaterialComponents/AppBar (15.0.0):
- MaterialComponents/AnimationTiming (16.2.0)
- MaterialComponents/AppBar (16.2.0):
- MaterialComponents/FlexibleHeader
- MaterialComponents/HeaderStackView
- MaterialComponents/NavigationBar
Expand All @@ -42,16 +43,16 @@ PODS:
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/ButtonBar (15.0.0):
- MaterialComponents/ButtonBar (16.2.0):
- MaterialComponents/Buttons
- MaterialComponents/private/RTL
- MaterialComponents/Buttons (15.0.0):
- MaterialComponents/Buttons (16.2.0):
- MaterialComponents/Ink
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MDFTextAccessibility
- MaterialComponents/CollectionCells (15.0.0):
- MaterialComponents/CollectionCells (16.2.0):
- MaterialComponents/CollectionLayoutAttributes
- MaterialComponents/Ink
- MaterialComponents/private/Icons/ic_check
Expand All @@ -62,100 +63,103 @@ PODS:
- MaterialComponents/private/Icons/ic_reorder
- MaterialComponents/private/RTL
- MaterialComponents/Typography
- MaterialComponents/CollectionLayoutAttributes (15.0.0)
- MaterialComponents/Collections (15.0.0):
- MaterialComponents/CollectionLayoutAttributes (16.2.0)
- MaterialComponents/Collections (16.2.0):
- MaterialComponents/CollectionCells
- MaterialComponents/CollectionLayoutAttributes
- MaterialComponents/Ink
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/Dialogs (15.0.0):
- MaterialComponents/Dialogs (16.2.0):
- MaterialComponents/Buttons
- MaterialComponents/private/KeyboardWatcher
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/FlexibleHeader (15.0.0):
- MaterialComponents/FeatureHighlight (16.2.0):
- MaterialComponents/Typography
- MDFTextAccessibility
- MaterialComponents/FlexibleHeader (16.2.0):
- MDFTextAccessibility
- MaterialComponents/FontDiskLoader (15.0.0)
- MaterialComponents/HeaderStackView (15.0.0)
- MaterialComponents/Ink (15.0.0)
- MaterialComponents/NavigationBar (15.0.0):
- MaterialComponents/FontDiskLoader (16.2.0)
- MaterialComponents/HeaderStackView (16.2.0)
- MaterialComponents/Ink (16.2.0)
- MaterialComponents/NavigationBar (16.2.0):
- MaterialComponents/ButtonBar
- MaterialComponents/private/RTL
- MaterialComponents/Typography
- MaterialComponents/OverlayWindow (15.0.0)
- MaterialComponents/PageControl (15.0.0)
- MaterialComponents/Palettes (15.0.0)
- MaterialComponents/private (15.0.0):
- MaterialComponents/private/Color (= 15.0.0)
- MaterialComponents/private/Icons (= 15.0.0)
- MaterialComponents/private/KeyboardWatcher (= 15.0.0)
- MaterialComponents/private/Overlay (= 15.0.0)
- MaterialComponents/private/RTL (= 15.0.0)
- MaterialComponents/private/ThumbTrack (= 15.0.0)
- MaterialComponents/private/Color (15.0.0)
- MaterialComponents/private/Icons (15.0.0):
- MaterialComponents/private/Icons/Base (= 15.0.0)
- MaterialComponents/private/Icons/ic_arrow_back (= 15.0.0)
- MaterialComponents/private/Icons/ic_check (= 15.0.0)
- MaterialComponents/private/Icons/ic_check_circle (= 15.0.0)
- MaterialComponents/private/Icons/ic_chevron_right (= 15.0.0)
- MaterialComponents/private/Icons/ic_info (= 15.0.0)
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 15.0.0)
- MaterialComponents/private/Icons/ic_reorder (= 15.0.0)
- MaterialComponents/private/Icons/Base (15.0.0)
- MaterialComponents/private/Icons/ic_arrow_back (15.0.0):
- MaterialComponents/OverlayWindow (16.2.0)
- MaterialComponents/PageControl (16.2.0)
- MaterialComponents/Palettes (16.2.0)
- MaterialComponents/private (16.2.0):
- MaterialComponents/private/Color (= 16.2.0)
- MaterialComponents/private/Icons (= 16.2.0)
- MaterialComponents/private/KeyboardWatcher (= 16.2.0)
- MaterialComponents/private/Overlay (= 16.2.0)
- MaterialComponents/private/RTL (= 16.2.0)
- MaterialComponents/private/ThumbTrack (= 16.2.0)
- MaterialComponents/private/Color (16.2.0)
- MaterialComponents/private/Icons (16.2.0):
- MaterialComponents/private/Icons/Base (= 16.2.0)
- MaterialComponents/private/Icons/ic_arrow_back (= 16.2.0)
- MaterialComponents/private/Icons/ic_check (= 16.2.0)
- MaterialComponents/private/Icons/ic_check_circle (= 16.2.0)
- MaterialComponents/private/Icons/ic_chevron_right (= 16.2.0)
- MaterialComponents/private/Icons/ic_info (= 16.2.0)
- MaterialComponents/private/Icons/ic_radio_button_unchecked (= 16.2.0)
- MaterialComponents/private/Icons/ic_reorder (= 16.2.0)
- MaterialComponents/private/Icons/Base (16.2.0)
- MaterialComponents/private/Icons/ic_arrow_back (16.2.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_check (15.0.0):
- MaterialComponents/private/Icons/ic_check (16.2.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_check_circle (15.0.0):
- MaterialComponents/private/Icons/ic_check_circle (16.2.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_chevron_right (15.0.0):
- MaterialComponents/private/Icons/ic_chevron_right (16.2.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_info (15.0.0):
- MaterialComponents/private/Icons/ic_info (16.2.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_radio_button_unchecked (15.0.0):
- MaterialComponents/private/Icons/ic_radio_button_unchecked (16.2.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/Icons/ic_reorder (15.0.0):
- MaterialComponents/private/Icons/ic_reorder (16.2.0):
- MaterialComponents/private/Icons/Base
- MaterialComponents/private/KeyboardWatcher (15.0.0)
- MaterialComponents/private/Overlay (15.0.0)
- MaterialComponents/private/RTL (15.0.0)
- MaterialComponents/private/ThumbTrack (15.0.0):
- MaterialComponents/private/KeyboardWatcher (16.2.0)
- MaterialComponents/private/Overlay (16.2.0)
- MaterialComponents/private/RTL (16.2.0)
- MaterialComponents/private/ThumbTrack (16.2.0):
- MaterialComponents/Ink
- MaterialComponents/private/Color
- MaterialComponents/ShadowElevations
- MaterialComponents/ShadowLayer
- MaterialComponents/Typography
- MaterialComponents/ProgressView (15.0.0):
- MaterialComponents/ProgressView (16.2.0):
- MaterialComponents/private/RTL
- MaterialComponents/RobotoFontLoader (15.0.0):
- MaterialComponents/RobotoFontLoader (16.2.0):
- MaterialComponents/FontDiskLoader
- MaterialComponents/Typography
- MaterialComponents/ShadowElevations (15.0.0)
- MaterialComponents/ShadowLayer (15.0.0)
- MaterialComponents/Slider (15.0.0):
- MaterialComponents/ShadowElevations (16.2.0)
- MaterialComponents/ShadowLayer (16.2.0)
- MaterialComponents/Slider (16.2.0):
- MaterialComponents/private/ThumbTrack
- MaterialComponents/Snackbar (15.0.0):
- MaterialComponents/Snackbar (16.2.0):
- MaterialComponents/AnimationTiming
- MaterialComponents/Buttons
- MaterialComponents/OverlayWindow
- MaterialComponents/private/KeyboardWatcher
- MaterialComponents/private/Overlay
- MaterialComponents/SpritedAnimationView (15.0.0)
- MaterialComponents/Switch (15.0.0):
- MaterialComponents/SpritedAnimationView (16.2.0)
- MaterialComponents/Switch (16.2.0):
- MaterialComponents/private/RTL
- MaterialComponents/private/ThumbTrack
- MaterialComponents/Tabs (15.0.0):
- MaterialComponents/Tabs (16.2.0):
- MaterialComponents/AnimationTiming
- MaterialComponents/Ink
- MaterialComponents/private/RTL
- MaterialComponents/Typography
- MaterialComponents/Typography (15.0.0)
- MaterialComponentsCatalog (15.0.0):
- MaterialComponents/Typography (16.2.0)
- MaterialComponentsCatalog (16.2.0):
- MaterialComponents
- MaterialComponentsUnitTests (15.0.0):
- MaterialComponentsUnitTests (16.2.0):
- MaterialComponents
- MDFTextAccessibility
- MDFTextAccessibility (1.1.1)
Expand All @@ -169,20 +173,20 @@ DEPENDENCIES:

EXTERNAL SOURCES:
MaterialComponents:
:path: "../"
:path: ../
MaterialComponentsCatalog:
:path: "../"
:path: ../
MaterialComponentsUnitTests:
:path: "../"
:path: ../

SPEC CHECKSUMS:
CatalogByConvention: 0e471a53b232b83be30141379b3ff0ad3365c3ec
EarlGrey: a75bceccb337860996e968f7f6239fd04c52d5d4
MaterialComponents: 2e546055134c272f6cc6d26ab4ea697611c94a8b
MaterialComponentsCatalog: fe35be22863a94075d9c25b205dead8df53df0ae
MaterialComponentsUnitTests: 5eca3cb1a741ab815a1f820f88119f90696fbdcb
MaterialComponents: b479d5f003974327f58e03f940764179a9b41580
MaterialComponentsCatalog: c66a111e2a412232c67b36b333c14f6cf746dcf5
MaterialComponentsUnitTests: 9bdcf1262f7a911c832b1b9787133480f52015f4
MDFTextAccessibility: 79e89490f26446f49ff47a116923e9b6cc10808e

PODFILE CHECKSUM: 522d8a942cbc2d1a94e939e565f528cc83468b01

COCOAPODS: 1.0.1
COCOAPODS: 1.1.1
Loading