X Tutup
Skip to content

Commit 779ca4b

Browse files
dalehenrichdalehenrich
authored
Merge pull request SeasideSt#15 from GsDevKit/issue_88
add 3.5.0 to lineup
2 parents 5d11884 + 1be6d85 commit 779ca4b

File tree

4 files changed

+34
-9
lines changed

4 files changed

+34
-9
lines changed

‎.travis.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ matrix:
1111
- smalltalk: Squeak-5.1
1212

1313
include:
14+
- smalltalk: Pharo64-8.0
15+
env: BUILD_NAME=Pharo64-8.0
1416
- smalltalk: Pharo64-7.0
1517
env: BUILD_NAME=Pharo64-7.0
1618
- smalltalk: Pharo64-6.1
@@ -28,6 +30,8 @@ matrix:
2830
env: BUILD_NAME=Squeak-5.2
2931
- smalltalk: Squeak-5.1
3032
env: BUILD_NAME=Squeak-5.1
33+
- smalltalk: GemStone-3.5.0
34+
env: BUILD_NAME=GemStone-3.5.0
3135
- smalltalk: GemStone-3.4.3
3236
env: BUILD_NAME=GemStone-3.4.3
3337
- smalltalk: GemStone-3.3.9

‎README.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +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.4.2](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.4.2&label=3.4.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-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.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) |
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.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) |
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.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-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.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.5.0&label=3.5.0)](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.3](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.4.3&label=3.4.3)](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) |
2728
| | | [![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) |
2829

2930
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)
@@ -105,4 +106,4 @@ Metacello new
105106
load
106107
```
107108

108-
In case you need a specific feature for Pharo 3, it is still possible to create a new release by branching from v1.4.1.
109+
In case you need a specific feature for Pharo 3, it is still possible to create a new release by branching from v1.4.1.

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,24 @@ baselinePharo: spec
5959
with: [ spec requires: #('Grease-Pharo40-Slime') ].
6060
spec
6161
group: 'Slime' with: #('Grease-Pharo40-Slime');
62-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ]
62+
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
63+
spec
64+
for: #(#'pharo8.x')
65+
do: [ spec
66+
package: 'Grease-Core'
67+
with: [ spec includes: #('Grease-Pharo70-Core') ];
68+
package: 'Grease-Tests-Core'
69+
with: [ spec
70+
requires: #('Grease-Pharo70-Core');
71+
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') ].
80+
spec
81+
group: 'Slime' with: #('Grease-Pharo40-Slime');
82+
group: 'Slime Tests' with: #('Grease-Tests-Slime') ]

repository/Grease-Tests-Pharo-Core.package/GRPackage.extension/class/greaseTestsPharo20Core.st renamed to repository/Grease-Tests-Pharo-Core.package/GRPackage.extension/class/greaseTestsPharoCore.st

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
*Grease-Tests-Pharo-Core
2-
greaseTestsPharo20Core
2+
greaseTestsPharoCore
33
^ self new
4-
name: 'Grease-Tests-Pharo20-Core';
4+
name: 'Grease-Tests-Pharo-Core';
55
description: 'Unit tests for the package Grease-Pharo-Core.';
6-
addDependency: 'Grease-Pharo20-Core';
6+
addDependency: 'Grease-Pharo-Core';
77
addDependency: 'Grease-Tests-Core';
88
url: #greaseUrl;
99
yourself

0 commit comments

Comments
 (0)
X Tutup