Skip to content

Commit cda440e

Browse files
committed
Merge branch 'master' into dev
2 parents 4ac2968 + 6973d2b commit cda440e

487 files changed

Lines changed: 3076 additions & 139 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.smalltalk.ston

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,21 @@ SmalltalkCISpec {
44
#baseline : 'Grease',
55
#directory : 'repository',
66
#load : [ 'Tests' ],
7-
#platforms : [ #squeak, #pharo ]
7+
#useLatestMetacello : true,
8+
#platforms : [ #squeak ]
9+
},
10+
SCIMetacelloLoadSpec {
11+
#baseline : 'Grease',
12+
#directory : 'repository',
13+
#load : [ 'Tests' ],
14+
#platforms : [ #pharo ]
815
},
916
SCIMetacelloLoadSpec {
1017
#baseline : 'Grease',
1118
#directory : 'repository',
1219
#onWarningLog : true,
1320
#load : [ 'Tests' ],
21+
#useLatestMetacello : true,
1422
#platforms : [ #gemstone ]
1523
}
1624
]

.travis.yml

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,38 @@
11
language: smalltalk
22
sudo: false
3+
34
smalltalk:
5+
- Pharo-alpha
6+
- Pharo-6.1
47
- Pharo-6.0
58
- Pharo-5.0
69
- Pharo-4.0
710
- Pharo-3.0
11+
- Squeak-trunk
812
- Squeak-5.1
9-
- GemStone-3.1.0.6
10-
- GemStone-3.2.16
11-
- GemStone-3.3.4
12-
cache:
13-
directories:
14-
- $SMALLTALK_CI_CACHE
15-
#matrix:
16-
# allow_failures:
17-
# - smalltalk: Pharo-6.0
13+
matrix:
14+
allow_failures:
15+
- smalltalk: Pharo-alpha
16+
- smalltalk: Squeak-trunk
17+
- smalltalk: Squeak-5.1
18+
os: linux
19+
20+
include:
21+
- smalltalk: Squeak-5.1
22+
os: osx
23+
- smalltalk: GemStone-2.4.8
24+
cache:
25+
directories:
26+
- $SMALLTALK_CI_CACHE
27+
- smalltalk: GemStone-3.1.0.6
28+
cache:
29+
directories:
30+
- $SMALLTALK_CI_CACHE
31+
- smalltalk: GemStone-3.2.16
32+
cache:
33+
directories:
34+
- $SMALLTALK_CI_CACHE
35+
- smalltalk: GemStone-3.3.4
36+
cache:
37+
directories:
38+
- $SMALLTALK_CI_CACHE

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

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ baseline: spec
1616
group: 'Tests' with: #('Core Tests' 'Slime Tests');
1717
group: 'default' with: #('Slime') ].
1818
spec
19-
for: #'squeak5.x'
19+
for: #( #'squeak5.x' )
2020
do: [
2121
spec
2222
package: 'Grease-Core'
@@ -34,6 +34,22 @@ baseline: spec
3434
package: 'Grease-Tests-Squeak5-Core'
3535
with: [ spec requires: #('Grease-Tests-Squeak-Core') ].
3636
self slimeForSqueakPharo1xPharo2x: spec ].
37+
spec
38+
for: #( #'squeak6.x' )
39+
do: [
40+
spec
41+
package: 'Grease-Core'
42+
with: [ spec includes: #('Grease-Squeak6-Core') ];
43+
package: 'Grease-Tests-Core'
44+
with: [ spec requires: #('Grease-Squeak6-Core'); includes: #('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak6-Core') ];
45+
package: 'Grease-Squeak6-Core'
46+
with: [ spec requires: #('Grease-Core') ];
47+
package: 'Grease-Tests-Squeak-Core'
48+
with: [ spec requires: #('Grease-Tests-Core') ];
49+
package: 'Grease-Tests-Squeak6-Core'
50+
with: [ spec requires: #('Grease-Tests-Squeak-Core') ].
51+
self slimeForSqueakPharo1xPharo2x: spec ].
52+
3753
spec
3854
for: #'pharo3.x'
3955
do: [
@@ -99,6 +115,27 @@ baseline: spec
99115
spec
100116
group: 'Slime' with: #('Grease-Pharo40-Slime');
101117
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
118+
119+
spec
120+
for: #(#'pharo7.x')
121+
do: [
122+
spec
123+
package: 'Grease-Core'
124+
with: [ spec includes: #('Grease-Pharo70-Core') ];
125+
package: 'Grease-Tests-Core'
126+
with: [ spec requires: #('Grease-Pharo70-Core'); includes: #('Grease-Tests-Pharo20-Core') ];
127+
package: 'Grease-Pharo70-Core'
128+
with: [ spec requires: #('Grease-Core') ];
129+
package: 'Grease-Tests-Pharo20-Core'
130+
with: [ spec requires: #('Grease-Tests-Core') ];
131+
package: 'Grease-Pharo40-Slime'
132+
with: [ spec requires: #('Grease-Core') ];
133+
package: 'Grease-Tests-Slime'
134+
with: [ spec requires: #('Grease-Pharo40-Slime') ].
135+
spec
136+
group: 'Slime' with: #('Grease-Pharo40-Slime');
137+
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
138+
102139
spec
103140
for: #'gemstone'
104141
do: [

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:" : "dkh 09/14/2017 15:35",
5+
"baseline:" : "JohanBrichau 11/18/2017 16:17",
66
"initializeLatin1ToUtf8Encodings" : "JohanBrichau 10/19/2014 10:00",
77
"slimeForSqueakPharo1xPharo2x:" : "JohanBrichau 02/16/2014 03:49" } }
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
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 ())
1+
(name 'BaselineOfGrease-dkh.1496564076' message 'merged by GitFileTree-MergeDriver' id '223df830-ac36-44de-9b3b-ebf4b0c05483' date '19 November 2017' time '10:41:23.91397 am' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.1496564073' message 'add 3.5.x and 3.6.x to lineup' id '865f6d62-3301-4211-b04c-ed674a603389' date '14 September 2017' time '3:40:24 pm' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.1496564072' message 'merged by GitFileTree-MergeDriver' id 'a721b096-25cd-455c-a419-2fac8a9331c7' date '23 July 2017' time '11:33:54 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 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 () stepChildren ())(name 'BaselineOfGrease-JohanBrichau.18' message 'Pharo 6 compatibility' id 'd2d614aa-b80c-0d00-b4b6-ae9900bfc9db' date '25 May 2017' time '12:46:04 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 am' author 'JohanBrichau' 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 ())) 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 am' 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 am' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1496564069' message 'Updated load snippets [ci skip]' id '26eaf907-cb05-504d-b251-ce1bcf3132ec' date '4 June 2017' time '10:14:29 am' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())(name 'BaselineOfGrease-JohanBrichau.1496564075' message 'Pharo7 support' id 'a8370418-a51a-0d00-a9b9-68b104322501' date '18 November 2017' time '4:17:52.094479 pm' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-topa.1496564074' message 'Splice out Squeak6' id '1f990177-0195-46d7-b815-43ff320f8900' date '15 November 2017' time '5:36:47.836067 pm' author 'topa' ancestors ((name 'BaselineOfGrease-topa.1496564073' message 'Add Squeak6 (current trunk)' id 'c284dcef-9b71-4069-94b7-a2e8c42b6c0a' date '8 November 2017' time '11:59:28.059517 am' author 'topa' ancestors ((id 'a721b096-25cd-455c-a419-2fac8a9331c7')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())

repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,6 @@ resolveWith: aDictionary
1919
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [
2020
"try -Squeak5-"
2121
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [
22-
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ]
22+
"try -Squeak6-"
23+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak6-') ifAbsent: [
24+
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ] ]
Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
11
{
2+
"class" : {
3+
"grPackages" : "JohanBrichau 12/15/2013 18:27",
4+
"greaseCore" : "pmm 9/12/2013 16:00" },
25
"instance" : {
6+
"addDependenciesTo:" : "lr 9/5/2009 18:35",
7+
"addDependency:" : "merged 10/20/2008 09:33",
8+
"allDependencies" : "lr 2/17/2010 15:18",
39
"dependencies" : "jf 3/15/2009 17:00",
4-
"license:" : "obi 10/8/2009 07:51",
10+
"description" : "merged 10/20/2008 09:23",
11+
"description:" : "lr 10/25/2009 11:26",
12+
"greaseUrl" : "pmm 9/12/2013 15:57",
513
"initialize" : "lr 2/17/2010 15:06",
14+
"isLGPL" : "lr 10/25/2009 15:19",
15+
"isMIT" : "lr 10/25/2009 15:19",
616
"license" : "lr 2/10/2010 11:18",
17+
"license:" : "obi 10/8/2009 07:51",
718
"name" : "lr 2/17/2010 15:18",
8-
"description:" : "lr 10/25/2009 11:26",
9-
"seasideUrl" : "pmm 9/12/2013 15:58",
10-
"allDependencies" : "lr 2/17/2010 15:18",
11-
"isLGPL" : "lr 10/25/2009 15:19",
12-
"seasideLGPLUrl" : "pmm 9/12/2013 15:59",
13-
"greaseUrl" : "pmm 9/12/2013 15:57",
1419
"name:" : "lr 10/25/2009 11:26",
15-
"description" : "merged 10/20/2008 09:23",
20+
"printOn:" : "merged 10/20/2008 09:24",
21+
"resolveWith:" : "topa 11/15/2017 17:31",
1622
"seasideAddonsUrl" : "pmm 9/12/2013 15:59",
17-
"resolveWith:" : "JohanBrichau 5/26/2017 15:56",
18-
"addDependency:" : "merged 10/20/2008 09:33",
23+
"seasideLGPLUrl" : "pmm 9/12/2013 15:59",
24+
"seasideUrl" : "pmm 9/12/2013 15:58",
1925
"url" : "lr 2/10/2010 11:18",
20-
"printOn:" : "merged 10/20/2008 09:24",
21-
"addDependenciesTo:" : "lr 9/5/2009 18:35",
22-
"url:" : "lr 2/17/2010 15:18",
23-
"isMIT" : "lr 10/25/2009 15:19"
24-
},
25-
"class" : {
26-
"greaseCore" : "pmm 9/12/2013 16:00",
27-
"grPackages" : "JohanBrichau 12/15/2013 18:27"
28-
}
29-
}
26+
"url:" : "lr 2/17/2010 15:18" } }
Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
{
2-
"commentStamp" : "pmm 9/14/2013 15:53",
3-
"super" : "GRObject",
42
"category" : "Grease-Core",
5-
"classinstvars" : [ ],
6-
"pools" : [ ],
7-
"classvars" : [ ],
3+
"classinstvars" : [
4+
],
5+
"classvars" : [
6+
],
7+
"commentStamp" : "pmm 9/14/2013 15:53",
88
"instvars" : [
99
"name",
1010
"description",
1111
"dependencies",
1212
"license",
13-
"url"
14-
],
13+
"url" ],
1514
"name" : "GRPackage",
16-
"type" : "normal"
17-
}
15+
"pools" : [
16+
],
17+
"super" : "GRObject",
18+
"type" : "normal" }

0 commit comments

Comments
 (0)