From 8573604c74d119562b95faee590b44483ef36b9a Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Tue, 12 Feb 2019 19:05:06 +0100 Subject: [PATCH 1/4] Renamed GRPackage>>greaseTestsPharo20Core to greaseTestsPharoCore to match the renamed package --- .../{greaseTestsPharo20Core.st => greaseTestsPharoCore.st} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename repository/Grease-Tests-Pharo-Core.package/GRPackage.extension/class/{greaseTestsPharo20Core.st => greaseTestsPharoCore.st} (62%) diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPackage.extension/class/greaseTestsPharo20Core.st b/repository/Grease-Tests-Pharo-Core.package/GRPackage.extension/class/greaseTestsPharoCore.st similarity index 62% rename from repository/Grease-Tests-Pharo-Core.package/GRPackage.extension/class/greaseTestsPharo20Core.st rename to repository/Grease-Tests-Pharo-Core.package/GRPackage.extension/class/greaseTestsPharoCore.st index 9e20de48..faa9bf79 100644 --- a/repository/Grease-Tests-Pharo-Core.package/GRPackage.extension/class/greaseTestsPharo20Core.st +++ b/repository/Grease-Tests-Pharo-Core.package/GRPackage.extension/class/greaseTestsPharoCore.st @@ -1,9 +1,9 @@ *Grease-Tests-Pharo-Core -greaseTestsPharo20Core +greaseTestsPharoCore ^ self new - name: 'Grease-Tests-Pharo20-Core'; + name: 'Grease-Tests-Pharo-Core'; description: 'Unit tests for the package Grease-Pharo-Core.'; - addDependency: 'Grease-Pharo20-Core'; + addDependency: 'Grease-Pharo-Core'; addDependency: 'Grease-Tests-Core'; url: #greaseUrl; yourself \ No newline at end of file From 7a36192877488331448906ade5a6d31323981e8b Mon Sep 17 00:00:00 2001 From: Norbert Hartl Date: Sat, 23 Mar 2019 11:13:25 +0100 Subject: [PATCH 2/4] Fixes #87 Adding pharo8 support --- .../instance/baselinePharo..st | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st index 8182da7d..4e9bd050 100644 --- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st +++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st @@ -59,4 +59,24 @@ baselinePharo: spec with: [ spec requires: #('Grease-Pharo40-Slime') ]. spec group: 'Slime' with: #('Grease-Pharo40-Slime'); - group: 'Slime Tests' with: #('Grease-Tests-Slime') ] \ No newline at end of file + group: 'Slime Tests' with: #('Grease-Tests-Slime') ]. + spec + for: #(#'pharo8.x') + do: [ spec + package: 'Grease-Core' + with: [ spec includes: #('Grease-Pharo70-Core') ]; + package: 'Grease-Tests-Core' + with: [ spec + requires: #('Grease-Pharo70-Core'); + includes: #('Grease-Tests-Pharo-Core') ]; + package: 'Grease-Pharo70-Core' + with: [ spec requires: #('Grease-Core') ]; + package: 'Grease-Tests-Pharo-Core' + with: [ spec requires: #('Grease-Tests-Core') ]; + package: 'Grease-Pharo40-Slime' + with: [ spec requires: #('Grease-Core') ]; + package: 'Grease-Tests-Slime' + with: [ spec requires: #('Grease-Pharo40-Slime') ]. + spec + group: 'Slime' with: #('Grease-Pharo40-Slime'); + group: 'Slime Tests' with: #('Grease-Tests-Slime') ] From 79a014c58ebd468287fb92f21e58a5cf54e83002 Mon Sep 17 00:00:00 2001 From: Norbert Hartl Date: Sat, 23 Mar 2019 11:18:51 +0100 Subject: [PATCH 3/4] Added pharo8 target to travis yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index ca457fe6..97321b55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,8 @@ matrix: - smalltalk: Squeak-5.1 include: + - smalltalk: Pharo64-8.0 + env: BUILD_NAME=Pharo64-8.0 - smalltalk: Pharo64-7.0 env: BUILD_NAME=Pharo64-7.0 - smalltalk: Pharo64-6.1 From 1be6d85ece8ebbc0be4463237b2d3e85138d1693 Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Sun, 16 Jun 2019 09:51:46 -0700 Subject: [PATCH 4/4] Issue #88: add 3.5.0 to lineup and update README --- .travis.yml | 2 ++ README.md | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97321b55..0c8e4f4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,8 @@ matrix: env: BUILD_NAME=Squeak-5.2 - smalltalk: Squeak-5.1 env: BUILD_NAME=Squeak-5.1 + - smalltalk: GemStone-3.5.0 + env: BUILD_NAME=GemStone-3.5.0 - smalltalk: GemStone-3.4.3 env: BUILD_NAME=GemStone-3.4.3 - smalltalk: GemStone-3.3.9 diff --git a/README.md b/README.md index 63f9b18f..f2c5f5d4 100644 --- a/README.md +++ b/README.md @@ -20,10 +20,11 @@ The latest Grease version is supported on the following platforms and versions, | Squeak | Pharo | GemStone | | --------------- | ---------------- | -------------------- | -| [![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) | -| [![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) | -| | [![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) | -| | [![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) | +| [![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) | +| [![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) | +| | [![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) | +| | [![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) | +| | | [![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) | | | | [![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) | 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 load ``` -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. \ No newline at end of file +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.