X Tutup
Skip to content

Commit 042a0a0

Browse files
dalehenrichdalehenrich
authored
Merge pull request #31 from GsDevKit/merge
Sync with SeasideSt/Grease master repo
2 parents 87912b5 + 58f6c57 commit 042a0a0

File tree

238 files changed

+1439
-132
lines changed

Some content is hidden

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

238 files changed

+1439
-132
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
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 ]
17+
smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.0, GemStone64-3.6.6, GemStone64-3.5.7, Squeak64-5.3 ]
1818
experimental: [ false ]
1919
include:
2020
- smalltalk: Pharo64-12

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
baselines
22
baselineCommon: spec
3+
34
spec
45
for: #common
56
do: [ spec blessing: #baseline.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
baselines
22
baselineGemStone: spec
3+
34
spec
45
for: #'gemstone'
56
do: [

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ baselinePharo: spec
6262
requires: #('Grease-Pharo100-Core');
6363
includes: #('Grease-Tests-Pharo-Core') ];
6464
package: 'Grease-Pharo100-Core' with: [ spec requires: #('Grease-Core') ];
65-
package: 'Grease-Pharo90-Slime' with: [ spec requires: #('Grease-Core') ];
66-
package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Pharo90-Slime') ].
65+
package: 'Grease-Pharo110-Slime' with: [ spec requires: #('Grease-Core') ];
66+
package: 'Grease-Tests-Pharo-Slime' with: [ spec requires: #('Grease-Pharo110-Slime') ].
6767

6868
spec
69-
group: 'Slime' with: #('Grease-Pharo90-Slime');
70-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ]
69+
group: 'Slime' with: #('Grease-Pharo110-Slime');
70+
group: 'Slime Tests' with: #('Grease-Tests-Pharo-Slime') ]

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

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

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ resolveWith: aDictionary
1717
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo90-') ifAbsent: [
1818
"try -Pharo100-"
1919
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 ] ] ] ] ] ] ] ] ] ] ] ] ]
20+
"try -Pharo110-"
21+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo110-') ifAbsent: [
22+
"try -Squeak-"
23+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [
24+
"try -Squeak5-"
25+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [
26+
"try -Squeak6-"
27+
aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak6-') ifAbsent: [
28+
"specific for Grease-Slime"
29+
aDictionary at: (each copyReplaceAll: 'Grease-Pharo-Slime' with: 'Grease-Slime') ifAbsent: [
30+
self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ] ] ] ] ]

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
files
2+
newTemporaryFile
3+
"Create a new temporary file in the systems temp directory and answer its pathString.
4+
It is the users responsibility to delete or move the file, it will not be cleaned up automatically
5+
(unless the host system has a policy for it)."
6+
^ self subclassResponsibility

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
files
2+
newTemporaryFileNamed: aName
3+
"Create a new temporary file in the systems temp directory and answer its pathString.
4+
It is the users responsibility to delete or move the file, it will not be cleaned up automatically
5+
(unless the host system has a policy for it)."
6+
self subclassResponsibility

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

Lines changed: 0 additions & 8 deletions
This file was deleted.

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

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)
X Tutup