X Tutup
Skip to content

Commit 19077c8

Browse files
author
Johan Brichau
authored
Merge pull request SeasideSt#64 from SeasideSt/master-to-dev
Merged changes to master (concerning Pharo 7) into dev branch
2 parents 3c1263b + 3bdb4aa commit 19077c8

File tree

38 files changed

+59
-326
lines changed

38 files changed

+59
-326
lines changed

‎.travis.yml‎

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,42 @@ language: smalltalk
22
sudo: false
33

44
smalltalk:
5-
- Pharo-alpha
5+
- Pharo64-7.0
6+
- Pharo64-6.1
67
- Pharo-6.1
7-
- Pharo-6.0
88
- Pharo-5.0
99
- Pharo-4.0
1010
- Pharo-3.0
1111
- Squeak-trunk
1212
- Squeak-5.1
13+
- GemStone-2.4.8
14+
- GemStone-3.1.0.6
15+
- GemStone-3.2.16
16+
- GemStone-3.3.4
1317
matrix:
1418
allow_failures:
1519
- smalltalk: Pharo-alpha
20+
- smalltalk: Pharo-3.0
21+
- smalltalk: Pharo-4.0
1622
- smalltalk: Squeak-trunk
17-
- smalltalk: Squeak-5.1
1823
os: linux
1924

2025
include:
21-
- smalltalk: Squeak-5.1
22-
os: osx
23-
- smalltalk: GemStone-2.4.8
24-
cache:
25-
directories:
26-
- $SMALLTALK_CI_CACHE
27-
- smalltalk: GemStone-3.1.0.6
28-
cache:
29-
directories:
30-
- $SMALLTALK_CI_CACHE
31-
- smalltalk: GemStone-3.2.16
32-
cache:
33-
directories:
34-
- $SMALLTALK_CI_CACHE
35-
- smalltalk: GemStone-3.3.4
36-
cache:
37-
directories:
38-
- $SMALLTALK_CI_CACHE
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

‎README.md‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,21 @@ Grease does not try to solve all problems. We are not testing Sockets or HTTP cl
1414

1515
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.
1616

17-
## Travis builds
17+
## Platform compatibility and Travis builds
1818

19-
The [Travis CI builds](https://travis-ci.org/SeasideSt/Grease) currently test Grease for the following platforms and versions:
19+
The latest Grease version is supported on the following platforms and versions, which are tested using [Travis CI builds](https://travis-ci.org/SeasideSt/Grease):
2020

2121
| Squeak | Pharo | GemStone |
2222
| --------------- | ---------------- | -------------------- |
23-
| Squeak 5.1 | Pharo 6.0 | GemStone 3.3.4 |
24-
| | Pharo 5.0 | GemStone 3.2.16 |
25-
| | Pharo 4.0 | GemStone 3.1.0.6 |
26-
| | Pharo 3.0 | |
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 |
27+
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)
2732

2833
## Installation
2934

‎repository/BaselineOfGrease.package/.filetree‎

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

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

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

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

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

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

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎repository/BaselineOfGrease.package/properties.json‎

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

‎repository/Grease-Pharo70-Core.package/BlockClosure.extension/methodProperties.json‎

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

‎repository/Grease-Pharo70-Core.package/ByteArray.extension/methodProperties.json‎

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

‎repository/Grease-Pharo70-Core.package/Character.extension/methodProperties.json‎

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

0 commit comments

Comments
 (0)
X Tutup