Sync GsDevKit/Grease with changes in SeasideSt/Grease

.smalltalk.ston

@@ -18,7 +18,6 @@ SmalltalkCISpec {
       #directory : 'repository',
       #onWarningLog : true,
       #load : [ 'Tests' ],
-      #useLatestMetacello : true, 
       #platforms : [ #gemstone ]
     }
   ]

.travis.yml

@@ -7,10 +7,11 @@ aliases:
 
 matrix:
   allow_failures:
-    - smalltalk: Squeak-trunk
-    - smalltalk: Squeak-5.1
-
+    - smalltalk: Pharo64-9.0
+    - smalltalk: Squeak32-trunk
   include:
+    - smalltalk: Pharo64-9.0
+      env: BUILD_NAME=Pharo64-9.0
     - smalltalk: Pharo64-8.0
       env: BUILD_NAME=Pharo64-8.0
     - smalltalk: Pharo64-7.0
@@ -24,16 +25,18 @@ matrix:
     - smalltalk: Pharo-4.0
       <<: *pharo4-has-latest-metacello
       env: BUILD_NAME=Pharo-4.0
-    - smalltalk: Squeak-trunk
+    - smalltalk: Squeak32-trunk
       env: BUILD_NAME=Squeak-trunk
-    - smalltalk: Squeak-5.2
+    - smalltalk: Squeak32-5.3
+      env: BUILD_NAME=Squeak-5.3
+    - smalltalk: Squeak32-5.2
       env: BUILD_NAME=Squeak-5.2
-    - smalltalk: Squeak-5.1
+    - smalltalk: Squeak32-5.1
       env: BUILD_NAME=Squeak-5.1
-    - smalltalk: GemStone-3.5.1
-      env: BUILD_NAME=GemStone-3.5.0
+    - smalltalk: GemStone-3.5.2
+      env: BUILD_NAME=GemStone-3.5.2
     - smalltalk: GemStone-3.4.5
-      env: BUILD_NAME=GemStone-3.4.3
+      env: BUILD_NAME=GemStone-3.4.5
     - smalltalk: GemStone-3.3.9
       env: BUILD_NAME=GemStone-3.3.9
     - smalltalk: GemStone-3.2.17

README.md

@@ -20,11 +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.5.1](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.5.1&label=3.5.1)](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.5](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.4.5&label=3.4.5)](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: 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-8.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-8.0&label=8.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.5.2](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.5.2&label=3.5.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-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.5](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.4.5&label=3.4.5)](http://travis-ci.org/SeasideSt/Grease) |
+|                 | [![Build status: Pharo-6.1](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-6.1&label=6.1)](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-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.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: 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: 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)
@@ -33,7 +33,7 @@ Coveralls (experimental): [![Coverage Status](https://coveralls.io/repos/github/
 
 #### Prerequisite on Squeak
 
-Make sure you have the [MetacelloPreview version](https://github.com/dalehenrich/metacello-work), otherwise the load will not work.
+Make sure you have the [MetacelloPreview version](https://github.com/Metacello/metacello), otherwise the load will not work.
 
 ### Squeak and Pharo (4.0 or newer)
 

repository/BaselineOfGrease.package/.filetree

@@ -1,4 +1,5 @@
 {
-	"noMethodMetaData" : true,
 	"separateMethodMetaAndSource" : false,
-	"useCypressPropertiesFile" : true }
+	"noMethodMetaData" : true,
+	"useCypressPropertiesFile" : true
+}

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

@@ -1,82 +1,63 @@
 baselines
 baselinePharo: spec
+
 	spec
 		for: #(#'pharo4.x' #'pharo5.x')
 		do: [ spec
-				package: 'Grease-Core'
-					with: [ spec includes: #('Grease-Pharo30-Core') ];
+				package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo30-Core') ];
+				package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
 				package: 'Grease-Tests-Core'
 					with: [ spec
 						requires: #('Grease-Pharo30-Core');
 						includes: #('Grease-Tests-Pharo-Core') ];
-				package: 'Grease-Pharo30-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') ].
+				package: 'Grease-Pharo30-Core' with: [ spec requires: #('Grease-Core') ] ].
+
 	spec
 		for: #'pharo6.x'
 		do: [ spec
-				package: 'Grease-Core'
-					with: [ spec includes: #('Grease-Pharo60-Core') ];
+				package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo60-Core') ];
+				package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
 				package: 'Grease-Tests-Core'
 					with: [ spec
 						requires: #('Grease-Pharo60-Core');
 						includes: #('Grease-Tests-Pharo-Core') ];
-				package: 'Grease-Pharo60-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') ].
+				package: 'Grease-Pharo60-Core' with: [ spec requires: #('Grease-Core') ] ].
+
 	spec
-		for: #(#'pharo7.x')
+		for: #(#'pharo7.x' #'pharo8.x')
 		do: [ spec
-				package: 'Grease-Core'
-					with: [ spec includes: #('Grease-Pharo70-Core') ];
+				package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo70-Core') ];
+				package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-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') ].
+				package: 'Grease-Pharo70-Core' with: [ spec requires: #('Grease-Core') ] ].
+
+	spec
+		for: #(#'pharo4.x' #'pharo5.x' #'pharo6.x' #'pharo7.x' #'pharo8.x')
+		do: [ 
+			spec
+				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') ].
+
 	spec
-		for: #(#'pharo8.x')
-		do: [ spec
-				package: 'Grease-Core'
-					with: [ spec includes: #('Grease-Pharo70-Core') ];
+		for: #'pharo9.x'
+		do: [ 
+			spec
+				package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo90-Core') ];
+				package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
 				package: 'Grease-Tests-Core'
 					with: [ spec
-						requires: #('Grease-Pharo70-Core');
+						requires: #('Grease-Pharo90-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') ].
+				package: 'Grease-Pharo90-Core' with: [ spec requires: #('Grease-Core') ];
+				package: 'Grease-Pharo90-Slime' with: [ spec requires: #('Grease-Core') ];
+				package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Pharo90-Slime') ].
+
 			spec
-				group: 'Slime' with: #('Grease-Pharo40-Slime');
-				group: 'Slime Tests' with: #('Grease-Tests-Slime') ]
+				group: 'Slime' with: #('Grease-Pharo90-Slime');
+				group: 'Slime Tests' with: #('Grease-Tests-Slime') ].

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

@@ -1,14 +1,11 @@
 {
-	"category" : "BaselineOfGrease",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "BaselineOfGrease",
-	"pools" : [
-		 ],
 	"super" : "BaselineOf",
-	"type" : "normal" }
+	"category" : "BaselineOfGrease",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "BaselineOfGrease",
+	"type" : "normal"
+}

repository/BaselineOfGrease.package/monticello.meta/categories.st

@@ -1 +1 @@
-SystemOrganization addCategory: #'BaselineOfGrease'!
+SystemOrganization addCategory: #BaselineOfGrease!

repository/BaselineOfGrease.package/properties.json

@@ -1,2 +1 @@
-{
-	 }
+{ }

repository/Grease-Core.package/monticello.meta/categories.st

@@ -1,5 +1,5 @@
 SystemOrganization addCategory: #'Grease-Core'!
-SystemOrganization addCategory: 'Grease-Core-Collections'!
-SystemOrganization addCategory: 'Grease-Core-Exceptions'!
-SystemOrganization addCategory: 'Grease-Core-Text'!
-SystemOrganization addCategory: 'Grease-Core-Utilities'!
+SystemOrganization addCategory: #'Grease-Core-Collections'!
+SystemOrganization addCategory: #'Grease-Core-Exceptions'!
+SystemOrganization addCategory: #'Grease-Core-Text'!
+SystemOrganization addCategory: #'Grease-Core-Utilities'!

repository/Grease-GemStone-Core.package/Symbol.extension/instance/greaseAsMutator.st

@@ -0,0 +1,3 @@
+*grease-gemstone-Core
+greaseAsMutator
+	^ self asMutator

repository/Grease-GemStone-Core.package/Symbol.extension/properties.json

@@ -0,0 +1,3 @@
+{
+	"name" : "Symbol"
+}

repository/Grease-Pharo30-Core.package/.filetree

@@ -1,4 +1,5 @@
 {
-	"noMethodMetaData" : true,
 	"separateMethodMetaAndSource" : false,
-	"useCypressPropertiesFile" : true }
+	"noMethodMetaData" : true,
+	"useCypressPropertiesFile" : true
+}

repository/Grease-Pharo30-Core.package/BlockClosure.extension/properties.json

@@ -1,2 +1,3 @@
 {
-	"name" : "BlockClosure" }
+	"name" : "BlockClosure"
+}

repository/Grease-Pharo30-Core.package/ByteArray.extension/properties.json

@@ -1,2 +1,3 @@
 {
-	"name" : "ByteArray" }
+	"name" : "ByteArray"
+}

repository/Grease-Pharo30-Core.package/Character.extension/properties.json

@@ -1,2 +1,3 @@
 {
-	"name" : "Character" }
+	"name" : "Character"
+}

repository/Grease-Pharo30-Core.package/Collection.extension/properties.json

@@ -1,2 +1,3 @@
 {
-	"name" : "Collection" }
+	"name" : "Collection"
+}

repository/Grease-Pharo30-Core.package/Duration.extension/properties.json

@@ -1,2 +1,3 @@
 {
-	"name" : "Duration" }
+	"name" : "Duration"
+}

repository/Grease-Pharo30-Core.package/GRDelegatingStream.extension/properties.json

@@ -1,2 +1,3 @@
 {
-	"name" : "GRDelegatingStream" }
+	"name" : "GRDelegatingStream"
+}

repository/Grease-Pharo30-Core.package/GRDynamicVariable.class/properties.json

@@ -1,14 +1,11 @@
 {
-	"category" : "Grease-Pharo30-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "MaxLeske 5/16/2017 22:05",
-	"instvars" : [
-		 ],
-	"name" : "GRDynamicVariable",
-	"pools" : [
-		 ],
 	"super" : "DynamicVariable",
-	"type" : "normal" }
+	"category" : "Grease-Pharo30-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "GRDynamicVariable",
+	"type" : "normal"
+}

repository/Grease-Pharo30-Core.package/GRPackage.extension/properties.json

@@ -1,2 +1,3 @@
 {
-	"name" : "GRPackage" }
+	"name" : "GRPackage"
+}

repository/Grease-Pharo30-Core.package/GRPharoConverterCodecStream.class/properties.json

@@ -1,14 +1,13 @@
 {
-	"category" : "Grease-Pharo30-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "pmm 6/25/2012 20:22",
+	"super" : "GRCodecStream",
+	"category" : "Grease-Pharo30-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
 	"instvars" : [
-		"converter" ],
+		"converter"
+	],
 	"name" : "GRPharoConverterCodecStream",
-	"pools" : [
-		 ],
-	"super" : "GRCodecStream",
-	"type" : "normal" }
+	"type" : "normal"
+}