Skip to content

Commit 4c5eedc

Browse files
author
Johan Brichau
committed
Merge branch 'dev'
# Conflicts: # .travis.yml # README.md # repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st # repository/Grease-Core.package/Character.extension/methodProperties.json # repository/Grease-Core.package/GRBoundMessage.class/methodProperties.json # repository/Grease-Core.package/GRCodec.class/methodProperties.json # repository/Grease-Core.package/GRCodecStream.class/methodProperties.json # repository/Grease-Core.package/GRCountingStream.class/methodProperties.json # repository/Grease-Core.package/GRDelayedSend.class/methodProperties.json # repository/Grease-Core.package/GRDelayedSendMessage.class/methodProperties.json # repository/Grease-Core.package/GRDelegatingStream.class/methodProperties.json # repository/Grease-Core.package/GRDeprecatedApiNotification.class/methodProperties.json # repository/Grease-Core.package/GRError.class/methodProperties.json # repository/Grease-Core.package/GRInflector.class/methodProperties.json # repository/Grease-Core.package/GRInvalidArgumentCount.class/methodProperties.json # repository/Grease-Core.package/GRInvalidUtf8Error.class/methodProperties.json # repository/Grease-Core.package/GRMappedPrinter.class/methodProperties.json # repository/Grease-Core.package/GRNotification.class/methodProperties.json # repository/Grease-Core.package/GRNullCodec.class/methodProperties.json # repository/Grease-Core.package/GRNullCodecStream.class/methodProperties.json # repository/Grease-Core.package/GRNumberPrinter.class/methodProperties.json # repository/Grease-Core.package/GRObject.class/methodProperties.json # repository/Grease-Core.package/GROrderedMultiMap.class/methodProperties.json # repository/Grease-Core.package/GROrderedMultiMap2.class/methodProperties.json # repository/Grease-Core.package/GROrdinalizePrinter.class/methodProperties.json # repository/Grease-Core.package/GRPackage.class/methodProperties.json # repository/Grease-Core.package/GRPlatform.class/methodProperties.json # repository/Grease-Core.package/GRPluggablePrinter.class/methodProperties.json # repository/Grease-Core.package/GRPrinter.class/methodProperties.json # repository/Grease-Core.package/GRSequentialPrinter.class/methodProperties.json # repository/Grease-Core.package/GRSignPrinter.class/methodProperties.json # repository/Grease-Core.package/GRSmallDictionary.class/methodProperties.json # repository/Grease-Core.package/GRSmallDictionary2.class/methodProperties.json # repository/Grease-Core.package/GRSmallOrderedSet.class/methodProperties.json # repository/Grease-Core.package/GRStringPrinter.class/methodProperties.json # repository/Grease-Core.package/GRUnboundMessage.class/methodProperties.json # repository/Grease-Core.package/GRUnitPrinter.class/methodProperties.json # repository/Grease-Core.package/GRUnsupportedEncodingError.class/methodProperties.json # repository/Grease-Core.package/GRVersion.class/methodProperties.json # repository/Grease-Core.package/Integer.extension/methodProperties.json # repository/Grease-Core.package/Number.extension/methodProperties.json # repository/Grease-Core.package/Object.extension/methodProperties.json # repository/Grease-Core.package/String.extension/methodProperties.json # repository/Grease-Core.package/UndefinedObject.extension/methodProperties.json # repository/Grease-Core.package/monticello.meta/version # repository/Grease-Pharo70-Core.package/monticello.meta/version
2 parents ed00d1b + 061dfed commit 4c5eedc

File tree

331 files changed

+2480
-1361
lines changed

Some content is hidden

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

331 files changed

+2480
-1361
lines changed

‎.pharo4.ston‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
SmalltalkCISpec {
2+
#loading : [
3+
SCIMetacelloLoadSpec {
4+
#useLatestMetacello : true,
5+
#baseline : 'Grease',
6+
#directory : 'repository',
7+
#load : [ 'Tests' ],
8+
#useLatestMetacello : true,
9+
#platforms : [ #pharo ]
10+
}
11+
]
12+
}

‎.project‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
'srcDirectory' : 'repository'
3+
}

‎.travis.yml‎

Lines changed: 34 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,41 @@
11
language: smalltalk
22
sudo: false
33

4-
smalltalk:
5-
- Pharo64-7.0
6-
- Pharo64-6.1
7-
- Pharo-6.1
8-
- Pharo-5.0
9-
- Pharo-4.0
10-
- Pharo-3.0
11-
- Squeak-trunk
12-
- Squeak-5.1
13-
- GemStone-2.4.8
14-
- GemStone-3.1.0.6
15-
- GemStone-3.2.16
16-
- GemStone-3.3.4
4+
aliases:
5+
- &pharo4-has-latest-metacello
6+
smalltalk_config: .pharo4.ston
7+
178
matrix:
189
allow_failures:
19-
- smalltalk: Pharo-alpha
20-
- smalltalk: Pharo-3.0
21-
- smalltalk: Pharo-4.0
2210
- smalltalk: Squeak-trunk
23-
os: linux
24-
11+
- smalltalk: Squeak-5.1
12+
2513
include:
26-
# - smalltalk: Squeak-5.1
27-
# os: osx
28-
# - smalltalk: GemStone-2.4.8
29-
# cache:
30-
# directories:
31-
# - $SMALLTALK_CI_CACHE
32-
# - smalltalk: GemStone-3.1.0.6
33-
# cache:
34-
# directories:
35-
# - $SMALLTALK_CI_CACHE
36-
# - smalltalk: GemStone-3.2.16
37-
# cache:
38-
# directories:
39-
# - $SMALLTALK_CI_CACHE
40-
# - smalltalk: GemStone-3.3.4
41-
# cache:
42-
# directories:
43-
# - $SMALLTALK_CI_CACHE
14+
- smalltalk: Pharo64-7.0
15+
env: BUILD_NAME=Pharo64-7.0
16+
- smalltalk: Pharo64-6.1
17+
env: BUILD_NAME=Pharo64-6.1
18+
- smalltalk: Pharo-6.1
19+
env: BUILD_NAME=Pharo-6.1
20+
- smalltalk: Pharo-5.0
21+
env: BUILD_NAME=Pharo-5.0
22+
- smalltalk: Pharo-4.0
23+
<<: *pharo4-has-latest-metacello
24+
env: BUILD_NAME=Pharo-4.0
25+
- smalltalk: Pharo-3.0
26+
<<: *pharo4-has-latest-metacello
27+
env: BUILD_NAME=Pharo-3.0
28+
- smalltalk: Squeak-trunk
29+
env: BUILD_NAME=Squeak-trunk
30+
- smalltalk: Squeak-5.2
31+
env: BUILD_NAME=Squeak-5.2
32+
- smalltalk: Squeak-5.1
33+
env: BUILD_NAME=Squeak-5.1
34+
- smalltalk: GemStone-3.3.4
35+
env: BUILD_NAME=GemStone-3.3.4
36+
- smalltalk: GemStone-3.2.16
37+
env: BUILD_NAME=GemStone-3.2.16
38+
- smalltalk: GemStone-3.1.0.6
39+
env: BUILD_NAME=GemStone-3.1.0.6
40+
- smalltalk: GemStone-2.4.8
41+
env: BUILD_NAME=GemStone-2.4.8

‎README.md‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
**IMPORTANT**: Since version 1.3.0, this is the main repository of Grease. Versions older than 1.1.9 can be found in the [Smalltalkhub repository](http://www.smalltalkhub.com/#!/~Seaside/Grease11). Check out the [releases list](https://github.com/SeasideSt/Grease/releases) for all version numbers in this repository.
1+
**IMPORTANT**: Since version 1.3.0, this is the main repository of Grease. Versions older than 1.1.9 can only be found in the [Smalltalkhub repository](http://www.smalltalkhub.com/#!/~Seaside/Grease11). Check out the [releases list](https://github.com/SeasideSt/Grease/releases) for all version numbers in this repository.
22

3-
The Grease Portability Library [![Build Status](https://travis-ci.org/SeasideSt/Grease.svg?branch=master)](https://travis-ci.org/SeasideSt/Grease)
3+
The Grease Portability Library
44
======
55
Grease enhances the ANSI Smalltalk standard. With only a few exceptions, we assume platforms are fully ANSI-compliant. Platforms want to support Seaside and standardization makes this easier for the project’s developers and its porters.
66

@@ -20,15 +20,13 @@ The latest Grease version is supported on the following platforms and versions,
2020

2121
| Squeak | Pharo | GemStone |
2222
| --------------- | ---------------- | -------------------- |
23-
| Squeak 5.1 | Pharo 7.0 | GemStone 3.3.4 |
24-
| | Pharo 6.1 | GemStone 3.2.16 |
25-
| | Pharo 5.0 | GemStone 3.1.0.6 |
26-
| | | GemStone 2.4.8 |
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.3.4](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.3.4&label=3.3.4)](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.2.16](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.2.16&label=3.2.16)](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.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) |
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-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) |
27+
| | [![Build status: Pharo-3.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-3.0&label=3.0)](http://travis-ci.org/SeasideSt/Grease) | |
2728

28-
## Grease on older platforms:
29-
If you want to load Grease on older platform versions, these are the version numbers that correspond to the latest tested version of Grease on those platform versions:
30-
31-
- Pharo 3.0 and 4.0: [Grease 1.3.4](https://github.com/SeasideSt/Grease/releases/tag/v1.3.4)
29+
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)
3230

3331
## Installation
3432

‎repository/.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
#format : #filetree
3+
}

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

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,39 @@ baseline: spec
1515
group: 'Slime Tests' with: #('Core Tests');
1616
group: 'Tests' with: #('Core Tests' 'Slime Tests');
1717
group: 'default' with: #('Slime') ].
18-
1918
spec
2019
for: #( #'squeak5.x' )
2120
do: [
21+
spec
22+
project: 'Refactoring-Core'
23+
with: [
24+
spec
25+
className: 'ConfigurationOfRefactoringBrowser';
26+
versionString: #'stable';
27+
loads: #('Core');
28+
repository: 'http://www.squeaksource.com/MetacelloRepository' ].
2229
spec
2330
package: 'Grease-Core'
2431
with: [ spec includes: #('Grease-Squeak5-Core') ];
2532
package: 'Grease-Tests-Core'
26-
with: [ spec requires: #('Grease-Squeak5-Core'); includes: #('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak5-Core') ];
33+
with: [
34+
spec
35+
requires: #('Grease-Squeak5-Core');
36+
includes:
37+
#('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak5-Core') ];
2738
package: 'Grease-Squeak5-Core'
2839
with: [ spec requires: #('Grease-Core') ];
2940
package: 'Grease-Tests-Squeak-Core'
3041
with: [ spec requires: #('Grease-Tests-Core') ];
3142
package: 'Grease-Tests-Squeak5-Core'
32-
with: [ spec requires: #('Grease-Tests-Squeak-Core') ].
33-
self slimeForSqueakPharo1xPharo2x: spec ].
34-
43+
with: [ spec requires: #('Grease-Tests-Squeak-Core') ];
44+
package: 'Grease-Slime'
45+
with: [ spec requires: #('Refactoring-Core' 'Grease-Core') ];
46+
package: 'Grease-Tests-Slime'
47+
with: [ spec requires: #('Grease-Slime') ].
48+
spec
49+
group: 'Slime' with: #('Grease-Slime');
50+
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
3551
spec
3652
for: #( #'squeak6.x' )
3753
do: [
@@ -55,7 +71,10 @@ baseline: spec
5571
package: 'Grease-Core'
5672
with: [ spec includes: #('Grease-Pharo30-Core') ];
5773
package: 'Grease-Tests-Core'
58-
with: [ spec requires: #('Grease-Pharo30-Core'); includes: #('Grease-Tests-Pharo20-Core') ];
74+
with: [
75+
spec
76+
requires: #('Grease-Pharo30-Core');
77+
includes: #('Grease-Tests-Pharo20-Core') ];
5978
package: 'Grease-Pharo30-Core'
6079
with: [ spec requires: #('Grease-Core') ];
6180
package: 'Grease-Tests-Pharo20-Core'
@@ -73,7 +92,10 @@ baseline: spec
7392
package: 'Grease-Core'
7493
with: [ spec includes: #('Grease-Pharo30-Core') ];
7594
package: 'Grease-Tests-Core'
76-
with: [ spec requires: #('Grease-Pharo30-Core'); includes: #('Grease-Tests-Pharo20-Core') ];
95+
with: [
96+
spec
97+
requires: #('Grease-Pharo30-Core');
98+
includes: #('Grease-Tests-Pharo20-Core') ];
7799
package: 'Grease-Pharo30-Core'
78100
with: [ spec requires: #('Grease-Core') ];
79101
package: 'Grease-Tests-Pharo20-Core'
@@ -86,13 +108,16 @@ baseline: spec
86108
group: 'Slime' with: #('Grease-Pharo40-Slime');
87109
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
88110
spec
89-
for: #(#'pharo6.x')
111+
for: #'pharo6.x'
90112
do: [
91113
spec
92114
package: 'Grease-Core'
93115
with: [ spec includes: #('Grease-Pharo60-Core') ];
94116
package: 'Grease-Tests-Core'
95-
with: [ spec requires: #('Grease-Pharo60-Core'); includes: #('Grease-Tests-Pharo20-Core') ];
117+
with: [
118+
spec
119+
requires: #('Grease-Pharo60-Core');
120+
includes: #('Grease-Tests-Pharo20-Core') ];
96121
package: 'Grease-Pharo60-Core'
97122
with: [ spec requires: #('Grease-Core') ];
98123
package: 'Grease-Tests-Pharo20-Core'
@@ -134,14 +159,16 @@ baseline: spec
134159
spec
135160
className: 'ConfigurationOfGsCore';
136161
versionString: #'stable';
137-
repository: 'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
162+
repository:
163+
'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
138164
project: 'UTF8'
139165
with: [
140166
spec
141167
className: 'ConfigurationOfGsMisc';
142168
versionString: #'stable';
143169
loads: #('Utf8Encoding');
144-
repository: 'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
170+
repository:
171+
'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
145172
project: 'System-Digital-Signatures'
146173
copyFrom: 'UTF8'
147174
with: [ spec loads: #('System-Digital-Signatures') ];
@@ -155,7 +182,10 @@ baseline: spec
155182
requires: #('GsCore');
156183
includes: #('Grease-GemStone-Core') ];
157184
package: 'Grease-Tests-Core'
158-
with: [ spec requires: #('Grease-GemStone-Core'); includes: #('Grease-Tests-GemStone-Core') ];
185+
with: [
186+
spec
187+
requires: #('Grease-GemStone-Core');
188+
includes: #('Grease-Tests-GemStone-Core') ];
159189
package: 'Grease-GemStone-Core'
160190
with: [
161191
spec
@@ -202,7 +232,6 @@ baseline: spec
202232
for: #(#'gs3.3.x' #'gs3.4.x')
203233
do: [
204234
spec
205-
package: 'Grease-GemStone330-Core';
206235
package: 'Grease-GemStone-Core'
207236
with: [ spec includes: #('Grease-GemStone330-Core') ];
208237
package: 'Grease-GemStone330-Core'
@@ -215,4 +244,4 @@ baseline: spec
215244
do: [
216245
spec
217246
package: 'Grease-Tests-GemStone-Core'
218-
with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]
247+
with: [ spec file: 'Grease-Tests-GemStone-Core.v32' ] ]

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
2-
"class" : {
3-
},
42
"instance" : {
5-
"baseline:" : "JohanBrichau 11/18/2017 16:17",
63
"initializeLatin1ToUtf8Encodings" : "JohanBrichau 10/19/2014 10:00",
7-
"slimeForSqueakPharo1xPharo2x:" : "JohanBrichau 02/16/2014 03:49" } }
4+
"slimeForSqueakPharo1xPharo2x:" : "JohanBrichau 02/16/2014 03:49",
5+
"baseline:" : "JohanBrichau 11/22/2018 09:09"
6+
},
7+
"class" : { }
8+
}

0 commit comments

Comments
 (0)