Skip to content

Commit b6ee952

Browse files
author
Johan Brichau
committed
Merge branch 'master' into slime-renovation
2 parents 8bd356e + b0307c4 commit b6ee952

File tree

203 files changed

+910
-454
lines changed

Some content is hidden

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

203 files changed

+910
-454
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.6.5, GemStone64-3.5.7, Squeak64-5.3 ]
11+
smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.0, GemStone64-3.6.7, GemStone64-3.5.7, Squeak64-5.3 ]
1212
experimental: [ false ]
1313
include:
1414
- smalltalk: Pharo64-12

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ baselineGemStone: spec
9797
with: [ spec includes: 'Grease-Tests-GemStone-Core' ] ].
9898

9999
spec
100-
for: #( #'gs3.5.4.x' #'gs3.5.5.x' #'gs3.5.6.x' #'gs3.5.7.x' )
100+
for: #( #'gs3.5.4.x' #'gs3.5.5.x' #'gs3.5.6.x' #'gs3.5.7.x' #'gs3.5.8.x' #'gs3.5.9.x' )
101101
do: [
102102
spec
103103
package: 'Grease-GemStone-Core'
@@ -116,11 +116,21 @@ baselineGemStone: spec
116116
with: [
117117
spec
118118
requires: #('Grease-GemStone-Core') ] ].
119+
spec
120+
for: #( #'gs3.7.x' #'gs3.8.x' #'gs3.9.x')
121+
do: [
122+
spec
123+
package: 'Grease-GemStone-Core'
124+
with: [ spec includes: #('Grease-GemStone-Kernelv370') ];
125+
package: 'Grease-GemStone-Kernelv370'
126+
with: [
127+
spec
128+
requires: #('Grease-GemStone-Core') ] ].
119129
spec
120130
for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x' #'gs3.7.x' #'gs3.8.x' #'gs3.9.x')
121131
do: [
122132
spec
123133
package: 'Grease-Tests-GemStone32-Core'
124134
with:[ spec requires: 'Grease-Tests-Core' ];
125135
package: 'Grease-Tests-Core'
126-
with: [ spec includes: 'Grease-Tests-GemStone32-Core' ] ]
136+
with: [ spec includes: 'Grease-Tests-GemStone32-Core' ] ]

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,7 @@ baselineSqueak: spec
2222
package: 'Grease-Tests-Squeak-Core'
2323
with: [ spec requires: #('Grease-Tests-Core') ];
2424
package: 'Grease-Tests-Squeak5-Core'
25-
with: [ spec requires: #('Grease-Tests-Squeak-Core') ];
26-
package: 'Grease-Slime'
27-
with: [ spec requires: #('Refactoring-Core' 'Grease-Core') ];
28-
package: 'Grease-Tests-Slime'
29-
with: [ spec requires: #('Grease-Slime') ].
30-
spec
31-
group: 'Slime' with: #('Grease-Slime');
32-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
25+
with: [ spec requires: #('Grease-Tests-Squeak-Core') ] ].
3326
spec
3427
for: #(#'squeak6.x')
3528
do: [
@@ -52,11 +45,4 @@ baselineSqueak: spec
5245
package: 'Grease-Tests-Squeak-Core'
5346
with: [ spec requires: #('Grease-Tests-Core') ];
5447
package: 'Grease-Tests-Squeak6-Core'
55-
with: [ spec requires: #('Grease-Tests-Squeak-Core') ];
56-
package: 'Grease-Slime'
57-
with: [ spec requires: #('Refactoring-Core' 'Grease-Core') ];
58-
package: 'Grease-Tests-Slime'
59-
with: [ spec requires: #('Grease-Slime') ].
60-
spec
61-
group: 'Slime' with: #('Grease-Slime');
62-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ]
48+
with: [ spec requires: #('Grease-Tests-Squeak-Core') ] ]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
SystemOrganization addCategory: #BaselineOfGrease!
2-
SystemOrganization addCategory: #'BaselineOfGrease-Manifest'!
1+
self packageOrganizer ensurePackage: #BaselineOfGrease withTags: #('Manifest')!

‎repository/Grease-Core.package/Collection.extension/instance/greaseAsByteArray.st‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*Grease-Core
2+
greaseAsByteArray
3+
^ self asByteArray

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"name" : "Collection"
3+
}

‎repository/Grease-Core.package/GRPlatform.class/instance/integerAsByteArray..st‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
encoding
2+
integerAsByteArray: anInteger
3+
^ anInteger asByteArray

‎repository/Grease-Core.package/GRPlatform.class/instance/sizeOfFile..st‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
files
2+
sizeOfFile: aString
3+
4+
self subclassResponsibility

‎repository/Grease-Core.package/Integer.extension/instance/greaseAsByteArray.st‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*Grease-Core
2+
greaseAsByteArray
3+
^ GRPlatform current integerAsByteArray: self

‎repository/Grease-Core.package/Integer.extension/instance/greaseByteAt..st‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*Grease-Core
2+
greaseByteAt: index
3+
^ self subclassResponsibility

0 commit comments

Comments
 (0)