X Tutup
Skip to content

Commit 2925fc8

Browse files
author
Johan Brichau
authored
Merge pull request SeasideSt#25 from SeasideSt/master
Grease v1.10
2 parents a88487c + 2a4832c commit 2925fc8

File tree

427 files changed

+270
-1485
lines changed

Some content is hidden

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

427 files changed

+270
-1485
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
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 ]
17+
smalltalk: [ Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, 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:
20-
- smalltalk: Squeak64-trunk
20+
- smalltalk: Pharo64-11
2121
experimental: true
22-
- smalltalk: Pharo64-10
22+
- smalltalk: Squeak64-trunk
2323
experimental: true
2424
continue-on-error: ${{ matrix.experimental }}
2525
name: ${{ matrix.smalltalk }}

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

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
baselines
22
baselinePharo: spec
3-
4-
spec
5-
for: #(#'pharo5.x')
6-
do: [ spec
7-
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo30-Core') ];
8-
package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
9-
package: 'Grease-Tests-Core'
10-
with: [ spec
11-
requires: #('Grease-Pharo30-Core');
12-
includes: #('Grease-Tests-Pharo-Core') ];
13-
package: 'Grease-Pharo30-Core' with: [ spec requires: #('Grease-Core') ] ].
143

154
spec
165
for: #'pharo6.x'
@@ -66,13 +55,13 @@ baselinePharo: spec
6655
for: #(#'pharo10.x')
6756
do: [
6857
spec
69-
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo10-Core') ];
58+
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo100-Core') ];
7059
package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
7160
package: 'Grease-Tests-Core'
7261
with: [ spec
73-
requires: #('Grease-Pharo10-Core');
62+
requires: #('Grease-Pharo100-Core');
7463
includes: #('Grease-Tests-Pharo-Core') ];
75-
package: 'Grease-Pharo10-Core' with: [ spec requires: #('Grease-Core') ];
64+
package: 'Grease-Pharo100-Core' with: [ spec requires: #('Grease-Core') ];
7665
package: 'Grease-Pharo90-Slime' with: [ spec requires: #('Grease-Core') ];
7766
package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Pharo90-Slime') ].
7867

‎repository/Grease-Core.package/GRDelegatingStream.class/instance/position..st‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
accessing
2+
position: anInteger
3+
^ stream position: anInteger

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ resolveWith: aDictionary
1414
"try -Pharo70-"
1515
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo70-') ifAbsent: [
1616
"try -Pharo90-"
17-
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo90-') ifAbsent: [
18-
"try -Squeak-"
19-
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [
20-
"try -Squeak5-"
21-
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [
22-
"try -Squeak6-"
23-
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak6-') ifAbsent: [
24-
"specific for Grease-Slime"
25-
aDictionary at: (each copyReplaceAll: 'Grease-Pharo-Slime' with: 'Grease-Slime') ifAbsent: [
26-
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ] ] ]
17+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo90-') ifAbsent: [
18+
"try -Pharo100-"
19+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo100-') ifAbsent: [
20+
"try -Squeak-"
21+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [
22+
"try -Squeak5-"
23+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [
24+
"try -Squeak6-"
25+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak6-') ifAbsent: [
26+
"specific for Grease-Slime"
27+
aDictionary at: (each copyReplaceAll: 'Grease-Pharo-Slime' with: 'Grease-Slime') ifAbsent: [
28+
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ] ] ] ]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
file library
1+
files
22
contentsOfFile: aString binary: aBoolean
33
self subclassResponsibility

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
file library
1+
files
22
directoriesIn: aPathString
33
"Answer a collection of absolute paths for all the directories (no files) in the directory given by aPathString
44
must not include directory names that start with ."

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
file library
1+
files
22
ensureExistenceOfFolder: aString
33
"Create a folder named aString in the image directory."
44
self subclassResponsibility

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
file library
1+
files
22
fileExists: aString
33
self subclassResponsibility

‎repository/Grease-Core.package/GRPlatform.class/instance/fileStreamOn.do.binary..st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
file library
1+
files
22
fileStreamOn: aString do: aBlock binary: aBoolean
33
self
44
greaseDeprecatedApi: 'GRPlatform>>#fileStreamOn:do:binary:'

0 commit comments

Comments
 (0)
X Tutup