X Tutup
Skip to content

Commit 8251c94

Browse files
author
Johan Brichau
committed
Fix for Squeak 5.1, removed support for squeak 4.6 and added Squeak 6 to see what happens
1 parent c4a2d00 commit 8251c94

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ smalltalk:
55
- Pharo-5.0
66
- Pharo-4.0
77
- Pharo-3.0
8+
- Squeak-6.0
89
- Squeak-5.1
9-
- Squeak-4.6
1010
- GemStone-3.1.0.6
1111
- GemStone-3.2.16
1212
- GemStone-3.3.4

‎README.md‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@ Grease does not try to solve all problems. We are not testing Sockets or HTTP cl
1515

1616
Grease is widely adopted. Implementations exist already for all platforms that support Seaside 3.x. As well as Seaside, new versions of Magritte, Pier, and Monticello are already being implemented on top of Grease.
1717

18-
##Travis builds
18+
## Travis builds
1919

2020
The [Travis CI builds](https://travis-ci.org/SeasideSt/Grease) currently test Grease for the following platforms and versions:
2121

2222
| Squeak | Pharo | GemStone |
2323
| --------------- | ---------------- | -------------------- |
24-
| Squeak 5.0 | Pharo 5.0 | GemStone 3.3.0 |
25-
| Squeak 4.5 | Pharo 4.0 | GemStone 3.2.12 |
26-
| | Pharo 3.0 | GemStone 3.1.0.6 |
24+
| Squeak 5.1 | Pharo 6.0 | GemStone 3.3.4 |
25+
| | Pharo 5.0 | GemStone 3.2.16 |
26+
| | Pharo 4.0 | GemStone 3.1.0.6 |
27+
| | Pharo 3.0 | |
2728

28-
##Installation
29+
## Installation
2930

30-
###Squeak and Pharo
31+
### Squeak and Pharo
3132

3233
Make sure you have the [MetacelloPreview version](https://github.com/dalehenrich/metacello-work), otherwise the load will not work. You have two options for loading: from Smalltalkhub or from Github.
3334

@@ -47,7 +48,7 @@ Metacello new
4748
githubUser: 'SeasideSt' project: 'Grease' commitish: '' path: 'repository';
4849
load
4950
```
50-
###GemStone
51+
### GemStone
5152

5253
Grease is part of the GLASS setup. You can upgrade your version of Grease using [GsUpgrader](https://github.com/GsDevKit/gsUpgrader).
5354
GsUpgrader works on all versions of GemStone against all versions of GLASS:

‎repository/Grease-Squeak5-Core.package/String.extension/instance/substrings..st‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*grease-squeak5-core
2+
substrings: separators
3+
^ self subStrings: separators

‎repository/Grease-Squeak5-Core.package/String.extension/methodProperties.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"class" : {
33
},
44
"instance" : {
5+
"substrings:" : "JB 5/25/2017 13:53",
56
"trimBoth" : "lr 10/25/2009 11:13",
67
"trimBoth:" : "lr 10/25/2009 11:11",
78
"trimLeft" : "lr 10/25/2009 11:14",

‎repository/Grease-Squeak5-Core.package/monticello.meta/version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
(name 'Grease-Squeak5-Core-TravisCI.10' message 'fix Squeak 5 tests' id '12f060db-b04d-420d-bb5d-a7d6e547680d' date '27 August 2016' time '3:19:34.029733 pm' author 'TravisCI' ancestors ((name 'Grease-Squeak5-Core-TravisCI.9' message 'extension methods to make tests work' id 'ec38e1f9-bef2-4390-a8df-d7792084be52' date '23 August 2016' time '11:03:45.642 am' author 'TravisCI' ancestors ((name 'Grease-Squeak5-Core-JB.8' message 'New package from Squeak5 onwards' id 'e3b34f8f-b14d-4fb1-95b8-86670bb48ed6' date '11 November 2015' time '1:12:31.115 pm' author 'JB' ancestors ((name 'Grease-Squeak-Core-JB.7' message 'Moved methods from Pharo-Core to Squeak-Core' id 'd870beb8-0de8-4e72-a73b-5f7e569fd859' date '11 November 2015' time '1:07:25.226 pm' author 'JB' ancestors ((name 'Grease-Squeak-Core-JohanBrichau.6' message 'Object>>#sizeInMemory asks #isCompact to determine the number ofbytes, but this has been removed from Squeak. Thanks Chris Muller' id '5899d218-fe39-41b2-880a-d052b41d0d63' date '24 October 2015' time '5:24:10.125 pm' author 'JB' ancestors ((name 'Grease-Squeak-Core-pmm.5' message '- add #sizeInMemory to Squeak' id '407fc250-3664-4ffb-ae92-17102efa6e47' date '15 July 2015' time '6:09:33.359 pm' author 'pmm' ancestors ((name 'Grease-Squeak-Core-pmm.4' message '- add more missing methods' id '1e5dee9a-f686-43eb-91e2-5942fe6143d5' date '15 July 2015' time '3:34:35.74 pm' author 'pmm' ancestors ((name 'Grease-Squeak-Core-pmm.3' message '- implement missing method' id '3683851e-6da7-4972-afa0-f4928390b3a9' date '15 July 2015' time '2:48:40.968 pm' author 'pmm' ancestors ((name 'Grease-Squeak-Core-JohnMcKeon.2' message '-add override of class initialize method' id '22c9a55a-0754-2a4c-8028-482fa4ffc669' date '19 March 2015' time '10:18:53.936 pm' author 'JohnMcKeon' ancestors ((name 'Grease-Squeak-Core-JohnMcKeon.1' message '-grease for squeak' id '76e50246-7376-7f43-9e50-daa9d7108db6' date '16 March 2015' time '9:14:49.119 pm' author 'JohnMcKeon' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
1+
(name 'Grease-Squeak5-Core-JB.11' message 'Added String>>substrings: method' id '1a829fc4-8f63-4ff5-a23f-33fbbea10ed2' date '25 May 2017' time '1:54:48.525961 pm' author 'JB' ancestors ((name 'Grease-Squeak5-Core-TravisCI.10' message 'fix Squeak 5 tests' id '12f060db-b04d-420d-bb5d-a7d6e547680d' date '27 August 2016' time '3:19:34.029733 pm' author 'TravisCI' ancestors ((name 'Grease-Squeak5-Core-TravisCI.9' message 'extension methods to make tests work' id 'ec38e1f9-bef2-4390-a8df-d7792084be52' date '23 August 2016' time '11:03:45.642 am' author 'TravisCI' ancestors ((name 'Grease-Squeak5-Core-JB.8' message 'New package from Squeak5 onwards' id 'e3b34f8f-b14d-4fb1-95b8-86670bb48ed6' date '11 November 2015' time '1:12:31.115 pm' author 'JB' ancestors ((name 'Grease-Squeak-Core-JB.7' message 'Moved methods from Pharo-Core to Squeak-Core' id 'd870beb8-0de8-4e72-a73b-5f7e569fd859' date '11 November 2015' time '1:07:25.226 pm' author 'JB' ancestors ((name 'Grease-Squeak-Core-JohanBrichau.6' message 'Object>>#sizeInMemory asks #isCompact to determine the number ofbytes, but this has been removed from Squeak. Thanks Chris Muller' id '5899d218-fe39-41b2-880a-d052b41d0d63' date '24 October 2015' time '5:24:10.125 pm' author 'JB' ancestors ((name 'Grease-Squeak-Core-pmm.5' message '- add #sizeInMemory to Squeak' id '407fc250-3664-4ffb-ae92-17102efa6e47' date '15 July 2015' time '6:09:33.359 pm' author 'pmm' ancestors ((name 'Grease-Squeak-Core-pmm.4' message '- add more missing methods' id '1e5dee9a-f686-43eb-91e2-5942fe6143d5' date '15 July 2015' time '3:34:35.74 pm' author 'pmm' ancestors ((name 'Grease-Squeak-Core-pmm.3' message '- implement missing method' id '3683851e-6da7-4972-afa0-f4928390b3a9' date '15 July 2015' time '2:48:40.968 pm' author 'pmm' ancestors ((name 'Grease-Squeak-Core-JohnMcKeon.2' message '-add override of class initialize method' id '22c9a55a-0754-2a4c-8028-482fa4ffc669' date '19 March 2015' time '10:18:53.936 pm' author 'JohnMcKeon' ancestors ((name 'Grease-Squeak-Core-JohnMcKeon.1' message '-grease for squeak' id '76e50246-7376-7f43-9e50-daa9d7108db6' date '16 March 2015' time '9:14:49.119 pm' author 'JohnMcKeon' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())

0 commit comments

Comments
 (0)
X Tutup