Skip to content

Commit 25a95e1

Browse files
authored
Merge pull request #13 from DuneSt/development
Release v1.2.0
2 parents b71565a + 1c3903f commit 25a95e1

File tree

66 files changed

+273
-44
lines changed

Some content is hidden

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

66 files changed

+273
-44
lines changed

.smalltalk.ston

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ SmalltalkCISpec {
22
#loading : [
33
SCIMetacelloLoadSpec {
44
#baseline : 'MaterialColors',
5-
#directory : 'src',
6-
#platforms : [ #pharo ]
5+
#directory : 'src'
76
}
87
]
98
}

.travis.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,12 @@ os:
66
- osx
77

88
smalltalk:
9-
- Pharo-6.0
10-
- Pharo-5.0
9+
- Pharo-7.0
10+
- Pharo-6.1
11+
- Pharo-5.0
12+
- GemStone-3.4.1
13+
14+
matrix:
15+
fast_finish: true
16+
allow_failures:
17+
- smalltalk: Pharo-7.0

CHANGELOG.md

Lines changed: 18 additions & 1 deletion

CONTRIBUTING.md

Lines changed: 31 additions & 0 deletions

README.md

Lines changed: 22 additions & 2 deletions

src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/baseline..st

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@ baseline: spec
33
<baseline>
44
spec
55
for: #common
6-
do: [
6+
do: [
77
"Packages"
88
spec
99
package: 'Material-Design-Colors';
10-
package: 'Material-Design-Tests-Colors' with: [ spec requires: #('Material-Design-Colors') ].
10+
package: 'Material-Design-Tests-Colors' with: [ spec requires: 'Material-Design-Colors' ].
1111

1212
"Groups"
1313
spec
1414
group: 'Core' with: #('Material-Design-Colors');
1515
group: 'all' with: #('default');
1616
group: 'Tests' with: #('Material-Design-Tests-Colors') ].
17-
self gemStone: spec
17+
self
18+
pharo: spec;
19+
gemStone: spec

src/BaselineOfMaterialColors.package/BaselineOfMaterialColors.class/instance/gemStone..st

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ gemStone: spec
44
for: #gemstone
55
do: [ spec
66
package: 'PackageManifest' with: [ spec repository: 'http://smalltalkhub.com/mc/pdebruic/PackageManifest/main' ];
7-
package: 'Material-Design-Colors' with: [ spec requires: 'PackageManifest' ] ]
7+
package: 'Material-Design-Colors' with: [ spec requires: 'PackageManifest' ];
8+
package: 'Material-Design-Colors-Platform-Gemstone' with: [ spec requires: 'Material-Design-Colors' ];
9+
package: 'Material-Design-Colors' with: [ spec includes: 'Material-Design-Colors-Platform-Gemstone' ] ]
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
baseline
2+
pharo: spec
3+
spec
4+
for: #pharo
5+
do: [ spec
6+
package: 'Material-Design-Colors-Platform-Pharo' with: [ spec requires: 'Material-Design-Colors' ];
7+
package: 'Material-Design-Colors' with: [ spec includes: 'Material-Design-Colors-Platform-Pharo' ] ]
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"separateMethodMetaAndSource" : false,
3+
"noMethodMetaData" : true,
4+
"useCypressPropertiesFile" : true
5+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
initialize-release
2+
initialize
3+
self register
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
accessing
2+
allSelectorsOf: aClass from: aSymbol
3+
"Return the lists of selectors understood by <aClass> and categorized in a protocol named <aSymbol>"
4+
5+
^ aClass allSelectors select: [ :selector | (aClass categoryOfSelector: selector) = aSymbol ]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
testing
2+
isGemstone
3+
^ true
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"commentStamp" : "CyrilFerlicot 7/4/2018 18:07",
3+
"super" : "MaterialColorPlatform",
4+
"category" : "Material-Design-Colors-Platform-Gemstone",
5+
"classinstvars" : [ ],
6+
"pools" : [ ],
7+
"classvars" : [ ],
8+
"instvars" : [ ],
9+
"name" : "MaterialColorGemstonePlatform",
10+
"type" : "normal"
11+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SystemOrganization addCategory: #'Material-Design-Colors-Platform-Gemstone'!

src/Material-Design-Colors-Platform-Gemstone.package/monticello.meta/initializers.st

Whitespace-only changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
(name 'Material-Design-Colors-Platform-Gemstone')
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{ }
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"separateMethodMetaAndSource" : false,
3+
"noMethodMetaData" : true,
4+
"useCypressPropertiesFile" : true
5+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
initialize-release
2+
initialize
3+
self register
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
accessing
2+
allSelectorsOf: aClass from: aSymbol
3+
"Return the lists of selectors understood by <aClass> and categorized in a protocol named <aSymbol>"
4+
5+
^ aClass allMethods select: [ :each | each protocol = aSymbol ] thenCollect: #selector
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
testing
2+
isPharo
3+
^ true
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"commentStamp" : "CyrilFerlicot 7/4/2018 18:05",
3+
"super" : "MaterialColorPlatform",
4+
"category" : "Material-Design-Colors-Platform-Pharo",
5+
"classinstvars" : [ ],
6+
"pools" : [ ],
7+
"classvars" : [ ],
8+
"instvars" : [ ],
9+
"name" : "MaterialColorPharoPlatform",
10+
"type" : "normal"
11+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SystemOrganization addCategory: #'Material-Design-Colors-Platform-Pharo'!

src/Material-Design-Colors-Platform-Pharo.package/monticello.meta/initializers.st

Whitespace-only changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
(name 'Material-Design-Colors-Platform-Pharo')
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{ }

src/Material-Design-Colors.package/Color.extension/instance/asRGBA.st

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ asRGBA
88
ifTrue: [ alph := alph allButLast: 2 ].
99
s
1010
nextPutAll: 'rgba(';
11-
<< (self red * 255) ceiling;
11+
print: (self red * 255) ceiling;
1212
nextPut: $,;
13-
<< (self green * 255) ceiling;
13+
print: (self green * 255) ceiling;
1414
nextPut: $,;
15-
<< (self blue * 255) ceiling;
15+
print: (self blue * 255) ceiling;
1616
nextPut: $,;
17-
<< alph;
17+
nextPutAll: alph;
1818
nextPut: $) ]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
accessing
22
allDefaultsColors
3-
^ (self class methodsInProtocol: #defaults) collect: [ :m | MDLColor perform: m selector ]
3+
^ (MaterialColorPlatform current allSelectorsOf: self class from: #'defaults - colors') collect: [ :selector | MDLColor perform: selector ]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
defaults
1+
defaults - colors
22
amber
33
^ self tint: #amber
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
defaults
1+
defaults - colors
22
blue
33
^ self tint: #blue
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
defaults
1+
defaults - colors
22
blueGrey
33
^ self tint: #blue_grey
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
defaults
1+
defaults - colors
22
brown
33
^ self tint: #brown
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
defaults
1+
defaults - colors
22
cyan
33
^ self tint: #cyan
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
defaults
1+
defaults - colors
22
deepOrange
33
^ self tint: #deep_orange
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
defaults
1+
defaults - colors
22
deepPurple
33
^ self tint: #deep_purple
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
defaults
1+
defaults - colors
22
green
33
^ self tint: #green
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
defaults
1+
defaults - colors
22
grey
33
^ self tint: #grey
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
defaults
1+
defaults - colors
22
indigo
33
^ self tint: #indigo
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
defaults
1+
defaults - colors
22
lightBlue
33
^ self tint: #light_blue
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
defaults
1+
defaults - colors
22
lightGreen
33
^ self tint: #light_green
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
defaults
1+
defaults - colors
22
lime
33
^ self tint: #lime
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
defaults
1+
defaults - colors
22
orange
33
^ self tint: #orange
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
defaults
1+
defaults - colors
22
pink
33
^ self tint: #pink
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
defaults
1+
defaults - colors
22
purple
33
^ self tint: #purple

0 commit comments

Comments
 (0)