X Tutup
Skip to content

Commit 7e69439

Browse files
dalehenrichdalehenrich
authored
Merge pull request SeasideSt#16 from SeasideSt/mergegrease
Sync GsDevKit/Grease with changes in SeasideSt/Grease
2 parents efff04d + 154b561 commit 7e69439

File tree

444 files changed

+2224
-324
lines changed

Some content is hidden

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

444 files changed

+2224
-324
lines changed

‎.smalltalk.ston‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ SmalltalkCISpec {
1818
#directory : 'repository',
1919
#onWarningLog : true,
2020
#load : [ 'Tests' ],
21-
#useLatestMetacello : true,
2221
#platforms : [ #gemstone ]
2322
}
2423
]

‎.travis.yml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ aliases:
77

88
matrix:
99
allow_failures:
10-
- smalltalk: Squeak-trunk
11-
- smalltalk: Squeak-5.1
12-
10+
- smalltalk: Pharo64-9.0
11+
- smalltalk: Squeak32-trunk
1312
include:
13+
- smalltalk: Pharo64-9.0
14+
env: BUILD_NAME=Pharo64-9.0
1415
- smalltalk: Pharo64-8.0
1516
env: BUILD_NAME=Pharo64-8.0
1617
- smalltalk: Pharo64-7.0
@@ -24,16 +25,18 @@ matrix:
2425
- smalltalk: Pharo-4.0
2526
<<: *pharo4-has-latest-metacello
2627
env: BUILD_NAME=Pharo-4.0
27-
- smalltalk: Squeak-trunk
28+
- smalltalk: Squeak32-trunk
2829
env: BUILD_NAME=Squeak-trunk
29-
- smalltalk: Squeak-5.2
30+
- smalltalk: Squeak32-5.3
31+
env: BUILD_NAME=Squeak-5.3
32+
- smalltalk: Squeak32-5.2
3033
env: BUILD_NAME=Squeak-5.2
31-
- smalltalk: Squeak-5.1
34+
- smalltalk: Squeak32-5.1
3235
env: BUILD_NAME=Squeak-5.1
33-
- smalltalk: GemStone-3.5.1
34-
env: BUILD_NAME=GemStone-3.5.0
36+
- smalltalk: GemStone-3.5.2
37+
env: BUILD_NAME=GemStone-3.5.2
3538
- smalltalk: GemStone-3.4.5
36-
env: BUILD_NAME=GemStone-3.4.3
39+
env: BUILD_NAME=GemStone-3.4.5
3740
- smalltalk: GemStone-3.3.9
3841
env: BUILD_NAME=GemStone-3.3.9
3942
- smalltalk: GemStone-3.2.17

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ The latest Grease version is supported on the following platforms and versions,
2020

2121
| Squeak | Pharo | GemStone |
2222
| --------------- | ---------------- | -------------------- |
23-
| [![Build status: Squeak-5.2](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Squeak-trunk&label=5.2)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Pharo64-7.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-7.0&label=7.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.5.1](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.5.1&label=3.5.1)](http://travis-ci.org/SeasideSt/Grease) |
24-
| [![Build status: Squeak-5.1](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Squeak-5.1&label=5.1)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Pharo64-6.1](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-6.1&label=6.1)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.4.5](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.4.5&label=3.4.5)](http://travis-ci.org/SeasideSt/Grease) |
25-
| | [![Build status: Pharo-5.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-5.0&label=5.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.3.9](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.3.9&label=3.3.9)](http://travis-ci.org/SeasideSt/Grease) |
26-
| | [![Build status: Pharo-4.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-4.0&label=4.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.2.17](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.2.17&label=3.2.17)](http://travis-ci.org/SeasideSt/Grease) |
27-
| | | [![Build status: Gemstone-3.1.0.6](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.1.0.6&label=3.1.0.6)](http://travis-ci.org/SeasideSt/Grease) |
23+
| [![Build status: Squeak-5.2](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Squeak-trunk&label=5.2)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Pharo64-8.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-8.0&label=8.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.5.2](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.5.2&label=3.5.2)](http://travis-ci.org/SeasideSt/Grease) |
24+
| [![Build status: Squeak-5.1](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Squeak-5.1&label=5.1)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Pharo64-7.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-7.0&label=7.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.4.5](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.4.5&label=3.4.5)](http://travis-ci.org/SeasideSt/Grease) |
25+
| | [![Build status: Pharo-6.1](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-6.1&label=6.1)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.3.9](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.3.9&label=3.3.9)](http://travis-ci.org/SeasideSt/Grease) |
26+
| | [![Build status: Pharo-5.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-5.0&label=5.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.2.17](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.2.17&label=3.2.17)](http://travis-ci.org/SeasideSt/Grease) |
27+
| | [![Build status: Pharo-4.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-4.0&label=4.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.1.0.6](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.1.0.6&label=3.1.0.6)](http://travis-ci.org/SeasideSt/Grease) |
2828
| | | [![Build status: Gemstone-2.4.8](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-2.4.8&label=2.4.8)](http://travis-ci.org/SeasideSt/Grease) |
2929

3030
Coveralls (experimental): [![Coverage Status](https://coveralls.io/repos/github/SeasideSt/Grease/badge.svg?branch=test-coveralls)](https://coveralls.io/github/SeasideSt/Grease?branch=test-coveralls)
@@ -33,7 +33,7 @@ Coveralls (experimental): [![Coverage Status](https://coveralls.io/repos/github/
3333

3434
#### Prerequisite on Squeak
3535

36-
Make sure you have the [MetacelloPreview version](https://github.com/dalehenrich/metacello-work), otherwise the load will not work.
36+
Make sure you have the [MetacelloPreview version](https://github.com/Metacello/metacello), otherwise the load will not work.
3737

3838
### Squeak and Pharo (4.0 or newer)
3939

‎repository/BaselineOfGrease.package/.filetree‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2-
"noMethodMetaData" : true,
32
"separateMethodMetaAndSource" : false,
4-
"useCypressPropertiesFile" : true }
3+
"noMethodMetaData" : true,
4+
"useCypressPropertiesFile" : true
5+
}

‎repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st‎

Lines changed: 33 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,63 @@
11
baselines
22
baselinePharo: spec
3+
34
spec
45
for: #(#'pharo4.x' #'pharo5.x')
56
do: [ spec
6-
package: 'Grease-Core'
7-
with: [ spec includes: #('Grease-Pharo30-Core') ];
7+
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo30-Core') ];
8+
package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
89
package: 'Grease-Tests-Core'
910
with: [ spec
1011
requires: #('Grease-Pharo30-Core');
1112
includes: #('Grease-Tests-Pharo-Core') ];
12-
package: 'Grease-Pharo30-Core'
13-
with: [ spec requires: #('Grease-Core') ];
14-
package: 'Grease-Tests-Pharo-Core'
15-
with: [ spec requires: #('Grease-Tests-Core') ];
16-
package: 'Grease-Pharo40-Slime'
17-
with: [ spec requires: #('Grease-Core') ];
18-
package: 'Grease-Tests-Slime'
19-
with: [ spec requires: #('Grease-Pharo40-Slime') ].
20-
spec
21-
group: 'Slime' with: #('Grease-Pharo40-Slime');
22-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
13+
package: 'Grease-Pharo30-Core' with: [ spec requires: #('Grease-Core') ] ].
14+
2315
spec
2416
for: #'pharo6.x'
2517
do: [ spec
26-
package: 'Grease-Core'
27-
with: [ spec includes: #('Grease-Pharo60-Core') ];
18+
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo60-Core') ];
19+
package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
2820
package: 'Grease-Tests-Core'
2921
with: [ spec
3022
requires: #('Grease-Pharo60-Core');
3123
includes: #('Grease-Tests-Pharo-Core') ];
32-
package: 'Grease-Pharo60-Core'
33-
with: [ spec requires: #('Grease-Core') ];
34-
package: 'Grease-Tests-Pharo-Core'
35-
with: [ spec requires: #('Grease-Tests-Core') ];
36-
package: 'Grease-Pharo40-Slime'
37-
with: [ spec requires: #('Grease-Core') ];
38-
package: 'Grease-Tests-Slime'
39-
with: [ spec requires: #('Grease-Pharo40-Slime') ].
40-
spec
41-
group: 'Slime' with: #('Grease-Pharo40-Slime');
42-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
24+
package: 'Grease-Pharo60-Core' with: [ spec requires: #('Grease-Core') ] ].
25+
4326
spec
44-
for: #(#'pharo7.x')
27+
for: #(#'pharo7.x' #'pharo8.x')
4528
do: [ spec
46-
package: 'Grease-Core'
47-
with: [ spec includes: #('Grease-Pharo70-Core') ];
29+
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo70-Core') ];
30+
package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
4831
package: 'Grease-Tests-Core'
4932
with: [ spec
5033
requires: #('Grease-Pharo70-Core');
5134
includes: #('Grease-Tests-Pharo-Core') ];
52-
package: 'Grease-Pharo70-Core'
53-
with: [ spec requires: #('Grease-Core') ];
54-
package: 'Grease-Tests-Pharo-Core'
55-
with: [ spec requires: #('Grease-Tests-Core') ];
56-
package: 'Grease-Pharo40-Slime'
57-
with: [ spec requires: #('Grease-Core') ];
58-
package: 'Grease-Tests-Slime'
59-
with: [ spec requires: #('Grease-Pharo40-Slime') ].
35+
package: 'Grease-Pharo70-Core' with: [ spec requires: #('Grease-Core') ] ].
36+
37+
spec
38+
for: #(#'pharo4.x' #'pharo5.x' #'pharo6.x' #'pharo7.x' #'pharo8.x')
39+
do: [
40+
spec
41+
package: 'Grease-Pharo40-Slime' with: [ spec requires: #('Grease-Core') ];
42+
package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Pharo40-Slime') ].
6043
spec
6144
group: 'Slime' with: #('Grease-Pharo40-Slime');
6245
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
46+
6347
spec
64-
for: #(#'pharo8.x')
65-
do: [ spec
66-
package: 'Grease-Core'
67-
with: [ spec includes: #('Grease-Pharo70-Core') ];
48+
for: #'pharo9.x'
49+
do: [
50+
spec
51+
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo90-Core') ];
52+
package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
6853
package: 'Grease-Tests-Core'
6954
with: [ spec
70-
requires: #('Grease-Pharo70-Core');
55+
requires: #('Grease-Pharo90-Core');
7156
includes: #('Grease-Tests-Pharo-Core') ];
72-
package: 'Grease-Pharo70-Core'
73-
with: [ spec requires: #('Grease-Core') ];
74-
package: 'Grease-Tests-Pharo-Core'
75-
with: [ spec requires: #('Grease-Tests-Core') ];
76-
package: 'Grease-Pharo40-Slime'
77-
with: [ spec requires: #('Grease-Core') ];
78-
package: 'Grease-Tests-Slime'
79-
with: [ spec requires: #('Grease-Pharo40-Slime') ].
57+
package: 'Grease-Pharo90-Core' with: [ spec requires: #('Grease-Core') ];
58+
package: 'Grease-Pharo90-Slime' with: [ spec requires: #('Grease-Core') ];
59+
package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Pharo90-Slime') ].
60+
8061
spec
81-
group: 'Slime' with: #('Grease-Pharo40-Slime');
82-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ]
62+
group: 'Slime' with: #('Grease-Pharo90-Slime');
63+
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].

‎repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
{
2-
"category" : "BaselineOfGrease",
3-
"classinstvars" : [
4-
],
5-
"classvars" : [
6-
],
72
"commentStamp" : "",
8-
"instvars" : [
9-
],
10-
"name" : "BaselineOfGrease",
11-
"pools" : [
12-
],
133
"super" : "BaselineOf",
14-
"type" : "normal" }
4+
"category" : "BaselineOfGrease",
5+
"classinstvars" : [ ],
6+
"pools" : [ ],
7+
"classvars" : [ ],
8+
"instvars" : [ ],
9+
"name" : "BaselineOfGrease",
10+
"type" : "normal"
11+
}

‎repository/BaselineOfGrease.package/monticello.meta/categories.st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SystemOrganization addCategory: #'BaselineOfGrease'!
1+
SystemOrganization addCategory: #BaselineOfGrease!

‎repository/BaselineOfGrease.package/monticello.meta/version‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎repository/BaselineOfGrease.package/properties.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
{
2-
}
1+
{ }

0 commit comments

Comments
 (0)
X Tutup