X Tutup
Skip to content

Commit d7574ad

Browse files
author
Johan Brichau
committed
Pick-up changes that were made in master.
Merge branch 'master' into dev # Conflicts: # repository/Grease-Tests-Core.package/GRDynamicVariableTest.class/instance/testDefaultValue.st
2 parents ea2d954 + 99e0051 commit d7574ad

File tree

11 files changed

+66
-23
lines changed

11 files changed

+66
-23
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
**IMPORTANT**: Since version 1.3.0, this is the main repository of Grease. Versions older than 1.1.9 can be found in the [Smalltalkhub repository](http://www.smalltalkhub.com/#!/~Seaside/Grease11). Check out the [releases list](https://github.com/SeasideSt/Grease/releases) for all version numbers in this repository.
22

3-
The Grease Portability Library [![Build Status](https://travis-ci.org/SeasideSt/Grease.png?branch=master)](https://travis-ci.org/SeasideSt/Grease)
3+
The Grease Portability Library [![Build Status](https://travis-ci.org/SeasideSt/Grease.svg?branch=master)](https://travis-ci.org/SeasideSt/Grease)
44
======
55
Grease enhances the ANSI Smalltalk standard. With only a few exceptions, we assume platforms are fully ANSI-compliant. Platforms want to support Seaside and standardization makes this easier for the project’s developers and its porters.
66

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@ baseline: spec
9797
spec
9898
className: 'ConfigurationOfGsCore';
9999
versionString: #'stable';
100-
repository: 'http://seaside.gemstone.com/ss/MetacelloRepository' ];
100+
repository: 'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
101101
project: 'UTF8'
102102
with: [
103103
spec
104104
className: 'ConfigurationOfGsMisc';
105105
versionString: #'stable';
106106
loads: #('Utf8Encoding');
107-
repository: 'http://seaside.gemstone.com/ss/MetacelloRepository' ];
107+
repository: 'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
108108
project: 'System-Digital-Signatures'
109109
copyFrom: 'UTF8'
110110
with: [ spec loads: #('System-Digital-Signatures') ];

‎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 7/23/2017 19:28",
36
"initializeLatin1ToUtf8Encodings" : "JohanBrichau 10/19/2014 10:00",
4-
"slimeForSqueakPharo1xPharo2x:" : "JohanBrichau 02/16/2014 03:49",
5-
"baseline:" : "JohanBrichau 7/23/2017 19:28"
6-
},
7-
"class" : { }
8-
}
7+
"slimeForSqueakPharo1xPharo2x:" : "JohanBrichau 02/16/2014 03:49" } }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SystemOrganization addCategory: #BaselineOfGrease!
1+
SystemOrganization addCategory: #'BaselineOfGrease'!

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
(name 'BaselineOfGrease-JohanBrichau.1496564071' message 'Fixed dependency of Grease-Tests-Core on the platform packages for GRDynamicVariableTest' id '6dd3612c-6111-0d00-8806-761908c307d1' date '23 July 2017' time '7:29:11.347398 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564070' message '- Removed pharo1.x and 2.x from the baseline since no longer supported.- Fixed dependency of Grease-Tests-Core on the platform packages for GRDynamicVariableTest' id 'd3220dff-6011-0d00-8805-b8f708c307d1' date '23 July 2017' time '7:16:30.82261 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564069' message 'Updated load snippets [ci skip]
2-
' id '26eaf907-cb05-504d-b251-ce1bcf3132ec' date '4 June 2017' time '10:14:29 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())
1+
(name 'BaselineOfGrease-dkh.1496564072' message 'merged by GitFileTree-MergeDriver' id 'a721b096-25cd-455c-a419-2fac8a9331c7' date '23 July 2017' time '11:33:54.267473 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.19' message 'merged by GitFileTree-MergeDriver' id 'b05179de-cbe6-4b80-824b-f6220d2c9252' date '25 May 2017' time '11:41:41.478907 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.17' message 'eliminate some seaside.gemstone.com references' id '01c1cf6a-4d84-47d2-97f0-b9c4d7fffd58' date '28 February 2017' time '1:54:50 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.16' message 'merged by GitFileTree-MergeDriver' id '644ab134-dd42-4b9f-948b-c277cd963d5d' date '26 August 2016' time '5:20:50 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.15' message 'merged by GitFileTree-MergeDriver' id '86b6f4f6-f95f-4bd7-9224-f31c5460e354' date '4 April 2016' time '9:40:53 am' author 'dkh' ancestors () stepChildren ())(name 'BaselineOfGrease-dkh.15' message 'merged by GitFileTree-MergeDriver' id '415af41c-2c3d-40a8-9f75-d9e8de921224' date '26 August 2016' time '2:19:29 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.10' message 'update for GemStone 3.4 ...' id 'ad7f9331-d83f-4976-bf57-1d1e81111fc6' date '21 December 2015' time '3:07:11 pm' author 'dkh' ancestors () stepChildren ())(name 'BaselineOfGrease-JohanBrichau.14' message 'Ensure Squeak5 tests package is loaded in Squeak5' id 'abde1bd6-a8d6-45fc-a922-bcf63ec38f03' date '27 February 2016' time '1:47:23 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.13' message 'Forked Grease-Tests-Pharo-Core into Grease-Tests-Squeak5-Core' id '3a01ebbc-8859-45db-ae5a-e5de8073d3a4' date '27 February 2016' time '1:40:18 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.12' message 'added Pharo-Tests to Squeak5 load' id 'ffe11ade-e4f1-496d-ae59-74543cfad134' date '27 February 2016' time '1:21:56 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.11' message 'added pharo5 platform to baseline' id '5c0332e9-ef4c-43cd-9066-7c9fe9ed6506' date '27 February 2016' time '12:12:12 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.10' message 'added squeak 5 platform' id '18f9d568-869f-4550-804a-b0ba101f33f3' date '13 December 2015' time '8:36:25 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-dkh.9' message 'Update baseline for GemStone 3.3' id 'af9364dd-14bc-4e5e-9fc7-0abe08732ab2' date '26 May 2015' time '11:46:07 am' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.8' message 'separate package for Squeak' id '91c019c7-2b8b-40c3-97d9-2047a69512a7' date '22 March 2015' time '12:01:37 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.7' message 'included Pharo 4 and did some baseline formatting' id '3722041d-d4b5-4496-a25a-0e891fe9a945' date '8 November 2014' time '9:28:01 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id '4d976044-1aa9-44b6-bab0-b66ac758b3cd' date '19 October 2014' time '10:05:25 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id 'b4ac5766-d472-4557-beff-59e5b733bce0' date '19 October 2014' time '10:04:55 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-dkh.5' message 'typoe' id '93eb3230-7956-4a6e-85dc-243f3dd895a1' date '4 June 2014' time '3:13:26 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.4' message 'woops specified the package branch incorrectly ... I think I got it right this time...' id '3003ee31-9d17-4dd1-9b9a-f8a80e4f0ba1' date '4 June 2014' time '3:12:31 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.3' message 'add Grease-Tests-GemStone-Core.v32 to baseline' id '26f128ca-b62e-4295-9a58-a9758b670c37' date '4 June 2014' time '2:57:48 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.2' message 'forgotten methods' id '38758da9-c922-4530-a19e-f8783900e787' date '16 February 2014' time '3:50:22 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1' message 'first baseline' id 'b89398df-14c6-4b6a-a2ba-91ad806bb07f' date '16 February 2014' time '1:49:46 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'BaselineOfGrease-JohanBrichau.18' message 'Pharo 6 compatibility' id 'd2d614aa-b80c-0d00-b4b6-ae9900bfc9db' date '25 May 2017' time '12:46:04.246978 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.17' message 'Added pharo6' id '52335469-982c-483b-a975-4518820b9bcf' date '25 May 2017' time '11:20:35.004053 am' author 'JohanBrichau' ancestors ((id '644ab134-dd42-4b9f-948b-c277cd963d5d')) stepChildren ())) stepChildren ())) stepChildren ())(name 'BaselineOfGrease-JohanBrichau.1496564071' message 'Fixed dependency of Grease-Tests-Core on the platform packages for GRDynamicVariableTest' id '6dd3612c-6111-0d00-8806-761908c307d1' date '23 July 2017' time '7:29:11.347398 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564070' message '- Removed pharo1.x and 2.x from the baseline since no longer supported.- Fixed dependency of Grease-Tests-Core on the platform packages for GRDynamicVariableTest' id 'd3220dff-6011-0d00-8805-b8f708c307d1' date '23 July 2017' time '7:16:30.82261 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564069' message 'Updated load snippets [ci skip]
2+
' id '26eaf907-cb05-504d-b251-ce1bcf3132ec' date '4 June 2017' time '10:14:29 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())

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

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
(name 'Grease-Pharo60-Core-pmm.7' message 'Small optimization- avoid table lookup in common case' id 'b99d6b17-1115-0d00-9402-d53004aeb9ca' date '8 September 2017' time '5:37:28.7948 pm' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.6' message 'Add thisContext method to GRPlatform' id 'b01ff64f-d114-0d00-9d20-ac690c6d599d' date '5 September 2017' time '1:31:59.489145 pm' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.5' message 'Add comments to classes who were previously missing them.' id '3f01c4b7-cc14-0d00-9c48-5d25066d8f9e' date '5 September 2017' time '8:03:06.198613 am' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.4' message 'Kick explorer support from Pharo 6- Closes #31' id 'f1e4d024-cc14-0d00-9c47-1a66066d8f9e' date '5 September 2017' time '7:22:00.792553 am' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-JohanBrichau.3' message 'Added GRDynamicVariable class>>defaultValue to represent the default value of a GRDynamicVariable. Previously, this was GRDynamicvariable>>default but this was not compatible for all platforms' id 'b7f896c0-5f11-0d00-87f2-d9cb08c307d1' date '23 July 2017' time '5:47:27.925141 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo60-Core-JohanBrichau.2' message 'Added GRDynamicVariable (copied from Grease-Pharo30-Core-MaxLeske.23)' id 'c95f31f1-ba0c-0d00-9a91-77be09e6dcd5' date '25 May 2017' time '3:29:07.233987 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo60-Core-JohanBrichau.1' message 'Split from Grease-Pharo30-Core-PavelKrivanek.22with changes for Pharo6.0 onwards' id 'fec0f92f-b80c-0d00-b4b4-c13800bfc9db' date '25 May 2017' time '12:11:55.651574 pm' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
1+
(name 'Grease-Pharo60-Core-pmm.8' message 'merged by GitFileTree-MergeDriver' id '49e9a6d2-4afa-43e9-b883-fbc1000ce921' date '9 September 2017' time '1:17:24.700967 pm' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.7' message 'Small optimization- avoid table lookup in common case' id 'b99d6b17-1115-0d00-9402-d53004aeb9ca' date '8 September 2017' time '5:37:28.7948 pm' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.6' message 'Add thisContext method to GRPlatform' id 'b01ff64f-d114-0d00-9d20-ac690c6d599d' date '5 September 2017' time '1:31:59.489145 pm' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.5' message 'Add comments to classes who were previously missing them.' id '3f01c4b7-cc14-0d00-9c48-5d25066d8f9e' date '5 September 2017' time '8:03:06.198613 am' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-pmm.4' message 'Kick explorer support from Pharo 6- Closes #31' id 'f1e4d024-cc14-0d00-9c47-1a66066d8f9e' date '5 September 2017' time '7:22:00.792553 am' author 'pmm' ancestors ((name 'Grease-Pharo60-Core-JohanBrichau.3' message 'Added GRDynamicVariable class>>defaultValue to represent the default value of a GRDynamicVariable. Previously, this was GRDynamicvariable>>default but this was not compatible for all platforms' id 'b7f896c0-5f11-0d00-87f2-d9cb08c307d1' date '23 July 2017' time '5:47:27.925141 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo60-Core-JohanBrichau.2' message 'Added GRDynamicVariable (copied from Grease-Pharo30-Core-MaxLeske.23)' id 'c95f31f1-ba0c-0d00-9a91-77be09e6dcd5' date '25 May 2017' time '3:29:07.233987 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo60-Core-JohanBrichau.1' message 'Split from Grease-Pharo30-Core-PavelKrivanek.22with changes for Pharo6.0 onwards' id 'fec0f92f-b80c-0d00-b4b4-c13800bfc9db' date '25 May 2017' time '12:11:55.651574 pm' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'Grease-Pharo60-Core-JohanBrichau.4' message 'merged by GitFileTree-MergeDriver' id '4a6b82fe-1522-4a8e-b82c-fc7704ba922a' date '23 July 2017' time '11:33:53.453973 am' author 'JohanBrichau' ancestors ((id 'b7f896c0-5f11-0d00-87f2-d9cb08c307d1')) stepChildren ())) stepChildren ())

0 commit comments

Comments
 (0)
X Tutup