X Tutup
Skip to content

Commit a88487c

Browse files
dalehenrichdalehenrich
authored
Merge pull request SeasideSt#24 from SeasideSt/master
Merge master into gsdevkit branch ... @jbrichau, I'll go ahead and merge now and pick up the pharo10 changes later
2 parents eef515d + deed35e commit a88487c

File tree

223 files changed

+1081
-22
lines changed

Some content is hidden

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

223 files changed

+1081
-22
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
smalltalk: [ Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, Pharo-6.1, GemStone64-3.6.1, GemStone64-3.5.6, GemStone64-3.4.5, GemStone64-3.3.9, GemStone64-3.2.17, GemStone64-3.1.0.6, Squeak64-5.3, Squeak64-5.2, Squeak64-5.1 ]
17+
smalltalk: [ Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, Pharo-6.1, GemStone64-3.6.3, GemStone64-3.5.7, GemStone64-3.4.5, GemStone64-3.3.9, GemStone64-3.2.17, GemStone64-3.1.0.6, Squeak64-5.3, Squeak64-5.2, Squeak64-5.1 ]
1818
experimental: [ false ]
1919
include:
2020
- smalltalk: Squeak64-trunk
2121
experimental: true
22+
- smalltalk: Pharo64-10
23+
experimental: true
2224
continue-on-error: ${{ matrix.experimental }}
2325
name: ${{ matrix.smalltalk }}
2426
steps:

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ baselinePharo: spec
4545
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
4646

4747
spec
48-
for: #'pharo9.x'
48+
for: #(#'pharo9.x')
4949
do: [
5050
spec
5151
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo90-Core') ];
@@ -58,6 +58,24 @@ baselinePharo: spec
5858
package: 'Grease-Pharo90-Slime' with: [ spec requires: #('Grease-Core') ];
5959
package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Pharo90-Slime') ].
6060

61+
spec
62+
group: 'Slime' with: #('Grease-Pharo90-Slime');
63+
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
64+
65+
spec
66+
for: #(#'pharo10.x')
67+
do: [
68+
spec
69+
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo10-Core') ];
70+
package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
71+
package: 'Grease-Tests-Core'
72+
with: [ spec
73+
requires: #('Grease-Pharo10-Core');
74+
includes: #('Grease-Tests-Pharo-Core') ];
75+
package: 'Grease-Pharo10-Core' with: [ spec requires: #('Grease-Core') ];
76+
package: 'Grease-Pharo90-Slime' with: [ spec requires: #('Grease-Core') ];
77+
package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Pharo90-Slime') ].
78+
6179
spec
6280
group: 'Slime' with: #('Grease-Pharo90-Slime');
6381
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ version info
22
version
33
"Answer the Grease version"
44

5-
^ (GRVersion major: 1 minor: 7 revision: 5)
5+
^ (GRVersion major: 1 minor: 8 revision: 0)
66
yourself

‎repository/Grease-GemStone-Core.package/GRGemStoneRandomProvider.class/properties.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"category" : "Grease-GemStone-Core",
33
"classinstvars" : [
4-
"mutex",
5-
"generator" ],
4+
],
65
"classvars" : [
76
],
87
"commentStamp" : "",

‎repository/Grease-Pharo10-Core.package/.filetree‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"separateMethodMetaAndSource" : false,
3+
"noMethodMetaData" : true,
4+
"useCypressPropertiesFile" : true
5+
}

‎repository/Grease-Pharo10-Core.package/Behavior.extension/instance/fullName.st‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
*Grease-Pharo10-Core
2+
fullName
3+
"In VW, will include the namespace"
4+
5+
^ self name

‎repository/Grease-Pharo10-Core.package/Behavior.extension/properties.json‎

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

‎repository/Grease-Pharo10-Core.package/BlockClosure.extension/instance/valueWithPossibleArguments..st‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
*Grease-Pharo10-Core
2+
valueWithPossibleArguments: anArray
3+
| args |
4+
(anArray size == self numArgs)
5+
ifTrue: [ ^ self valueWithArguments: anArray ].
6+
args := Array new: self numArgs.
7+
args replaceFrom: 1
8+
to: (anArray size min: args size)
9+
with: anArray
10+
startingAt: 1.
11+
^ self valueWithArguments: args

‎repository/Grease-Pharo10-Core.package/BlockClosure.extension/properties.json‎

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

‎repository/Grease-Pharo10-Core.package/ByteArray.extension/instance/greaseString.st‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
*Grease-Pharo10-Core
2+
greaseString
3+
"ByteArrays should not automatically be converted to Strings. You should use a GRCodec for this."
4+
^ self printString

0 commit comments

Comments
 (0)
X Tutup