Skip to content

Commit 81f9c8e

Browse files
dalehenrichdalehenrich
committed
add 3.5.x and 3.6.x to lineup
1 parent 37c6e34 commit 81f9c8e

6 files changed

Lines changed: 44 additions & 26 deletions

File tree

‎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/instance/baseline..st‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,36 @@ baseline: spec
1515
group: 'Slime Tests' with: #('Core Tests');
1616
group: 'Tests' with: #('Core Tests' 'Slime Tests');
1717
group: 'default' with: #('Slime') ].
18-
1918
spec
2019
for: #'squeak5.x'
2120
do: [
2221
spec
2322
package: 'Grease-Core'
2423
with: [ spec includes: #('Grease-Squeak5-Core') ];
2524
package: 'Grease-Tests-Core'
26-
with: [ spec requires: #('Grease-Squeak5-Core'); includes: #('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak5-Core') ];
25+
with: [
26+
spec
27+
requires: #('Grease-Squeak5-Core');
28+
includes:
29+
#('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak5-Core') ];
2730
package: 'Grease-Squeak5-Core'
2831
with: [ spec requires: #('Grease-Core') ];
2932
package: 'Grease-Tests-Squeak-Core'
3033
with: [ spec requires: #('Grease-Tests-Core') ];
3134
package: 'Grease-Tests-Squeak5-Core'
3235
with: [ spec requires: #('Grease-Tests-Squeak-Core') ].
33-
self slimeForSqueakPharo1xPharo2x: spec ].
34-
36+
self slimeForSqueakPharo1xPharo2x: spec ].
3537
spec
3638
for: #'pharo3.x'
3739
do: [
3840
spec
3941
package: 'Grease-Core'
4042
with: [ spec includes: #('Grease-Pharo30-Core') ];
4143
package: 'Grease-Tests-Core'
42-
with: [ spec requires: #('Grease-Pharo30-Core'); includes: #('Grease-Tests-Pharo20-Core') ];
44+
with: [
45+
spec
46+
requires: #('Grease-Pharo30-Core');
47+
includes: #('Grease-Tests-Pharo20-Core') ];
4348
package: 'Grease-Pharo30-Core'
4449
with: [ spec requires: #('Grease-Core') ];
4550
package: 'Grease-Tests-Pharo20-Core'
@@ -57,7 +62,10 @@ baseline: spec
5762
package: 'Grease-Core'
5863
with: [ spec includes: #('Grease-Pharo30-Core') ];
5964
package: 'Grease-Tests-Core'
60-
with: [ spec requires: #('Grease-Pharo30-Core'); includes: #('Grease-Tests-Pharo20-Core') ];
65+
with: [
66+
spec
67+
requires: #('Grease-Pharo30-Core');
68+
includes: #('Grease-Tests-Pharo20-Core') ];
6169
package: 'Grease-Pharo30-Core'
6270
with: [ spec requires: #('Grease-Core') ];
6371
package: 'Grease-Tests-Pharo20-Core'
@@ -76,7 +84,10 @@ baseline: spec
7684
package: 'Grease-Core'
7785
with: [ spec includes: #('Grease-Pharo60-Core') ];
7886
package: 'Grease-Tests-Core'
79-
with: [ spec requires: #('Grease-Pharo60-Core'); includes: #('Grease-Tests-Pharo20-Core') ];
87+
with: [
88+
spec
89+
requires: #('Grease-Pharo60-Core');
90+
includes: #('Grease-Tests-Pharo20-Core') ];
8091
package: 'Grease-Pharo60-Core'
8192
with: [ spec requires: #('Grease-Core') ];
8293
package: 'Grease-Tests-Pharo20-Core'
@@ -97,14 +108,16 @@ baseline: spec
97108
spec
98109
className: 'ConfigurationOfGsCore';
99110
versionString: #'stable';
100-
repository: 'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
111+
repository:
112+
'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
101113
project: 'UTF8'
102114
with: [
103115
spec
104116
className: 'ConfigurationOfGsMisc';
105117
versionString: #'stable';
106118
loads: #('Utf8Encoding');
107-
repository: 'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
119+
repository:
120+
'http://seaside.gemtalksystems.com/ss/MetacelloRepository' ];
108121
project: 'System-Digital-Signatures'
109122
copyFrom: 'UTF8'
110123
with: [ spec loads: #('System-Digital-Signatures') ];
@@ -118,7 +131,10 @@ baseline: spec
118131
requires: #('GsCore');
119132
includes: #('Grease-GemStone-Core') ];
120133
package: 'Grease-Tests-Core'
121-
with: [ spec requires: #('Grease-GemStone-Core'); includes: #('Grease-Tests-GemStone-Core') ];
134+
with: [
135+
spec
136+
requires: #('Grease-GemStone-Core');
137+
includes: #('Grease-Tests-GemStone-Core') ];
122138
package: 'Grease-GemStone-Core'
123139
with: [
124140
spec
@@ -162,7 +178,7 @@ baseline: spec
162178
requires: #('Grease-GemStone-Core');
163179
postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
164180
spec
165-
for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x')
181+
for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x')
166182
do: [
167183
spec
168184
package: 'Grease-Tests-GemStone-Core'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"class" : {
33
},
44
"instance" : {
5-
"baseline:" : "JohanBrichau 7/23/2017 19:28",
5+
"baseline:" : "dkh 09/14/2017 15:35",
66
"initializeLatin1ToUtf8Encodings" : "JohanBrichau 10/19/2014 10:00",
77
"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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
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 ())
1+
(name 'BaselineOfGrease-dkh.1496564073' message 'add 3.5.x and 3.6.x to lineup' id '865f6d62-3301-4211-b04c-ed674a603389' date '09/14/2017' time '15:40:24' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.1496564072' message 'merged by GitFileTree-MergeDriver' id 'a721b096-25cd-455c-a419-2fac8a9331c7' date '07/23/2017' time '11:33:54' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.19' message 'merged by GitFileTree-MergeDriver' id 'b05179de-cbe6-4b80-824b-f6220d2c9252' date '05/25/2017' time '11:41:41' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.17' message 'eliminate some seaside.gemstone.com references' id '01c1cf6a-4d84-47d2-97f0-b9c4d7fffd58' date '02/28/2017' time '13:54:50' author 'dkh' ancestors () stepChildren ())(name 'BaselineOfGrease-JohanBrichau.18' message 'Pharo 6 compatibility' id 'd2d614aa-b80c-0d00-b4b6-ae9900bfc9db' date '05/25/2017' time '12:46:04' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.17' message 'Added pharo6' id '52335469-982c-483b-a975-4518820b9bcf' date '05/25/2017' time '11:20:35' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-dkh.16' message 'merged by GitFileTree-MergeDriver' id '644ab134-dd42-4b9f-948b-c277cd963d5d' date '08/26/2016' time '05:20:50' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.15' message 'merged by GitFileTree-MergeDriver' id '86b6f4f6-f95f-4bd7-9224-f31c5460e354' date '04/04/2016' time '09:40:53' author 'dkh' ancestors () stepChildren ())(name 'BaselineOfGrease-dkh.15' message 'merged by GitFileTree-MergeDriver' id '415af41c-2c3d-40a8-9f75-d9e8de921224' date '08/26/2016' time '02:19:29' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.10' message 'update for GemStone 3.4 ...' id 'ad7f9331-d83f-4976-bf57-1d1e81111fc6' date '12/21/2015' time '15:07:11' author 'dkh' ancestors () stepChildren ())(name 'BaselineOfGrease-JohanBrichau.14' message 'Ensure Squeak5 tests package is loaded in Squeak5' id 'abde1bd6-a8d6-45fc-a922-bcf63ec38f03' date '02/27/2016' time '01:47:23' 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 '02/27/2016' time '01:40:18' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.12' message 'added Pharo-Tests to Squeak5 load' id 'ffe11ade-e4f1-496d-ae59-74543cfad134' date '02/27/2016' time '01:21:56' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.11' message 'added pharo5 platform to baseline' id '5c0332e9-ef4c-43cd-9066-7c9fe9ed6506' date '02/27/2016' time '12:12:12' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.10' message 'added squeak 5 platform' id '18f9d568-869f-4550-804a-b0ba101f33f3' date '12/13/2015' time '08:36:25' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-dkh.9' message 'Update baseline for GemStone 3.3' id 'af9364dd-14bc-4e5e-9fc7-0abe08732ab2' date '05/26/2015' time '11:46:07' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.8' message 'separate package for Squeak' id '91c019c7-2b8b-40c3-97d9-2047a69512a7' date '03/22/2015' time '12:01:37' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.7' message 'included Pharo 4 and did some baseline formatting' id '3722041d-d4b5-4496-a25a-0e891fe9a945' date '11/08/2014' time '09:28:01' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id '4d976044-1aa9-44b6-bab0-b66ac758b3cd' date '10/19/2014' time '10:05:25' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id 'b4ac5766-d472-4557-beff-59e5b733bce0' date '10/19/2014' time '10:04:55' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-dkh.5' message 'typoe' id '93eb3230-7956-4a6e-85dc-243f3dd895a1' date '06/04/2014' time '15:13:26' 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 '06/04/2014' time '15:12:31' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.3' message 'add Grease-Tests-GemStone-Core.v32 to baseline' id '26f128ca-b62e-4295-9a58-a9758b670c37' date '06/04/2014' time '14:57:48' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.2' message 'forgotten methods' id '38758da9-c922-4530-a19e-f8783900e787' date '02/16/2014' time '03:50:22' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1' message 'first baseline' id 'b89398df-14c6-4b6a-a2ba-91ad806bb07f' date '02/16/2014' time '01:49:46' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) 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 '07/23/2017' time '07:29:11' 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 '07/23/2017' time '07:16:30' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564069' message 'Updated load snippets [ci skip]' id '26eaf907-cb05-504d-b251-ce1bcf3132ec' date '06/04/2017' time '10:14:29' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())

‎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+
}

0 commit comments

Comments
 (0)