X Tutup
Skip to content

Commit 87912b5

Browse files
dalehenrichdalehenrich
authored
Merge pull request #29 from SeasideSt/master
Sync Grease from master
2 parents b0ade95 + b0307c4 commit 87912b5

Some content is hidden

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

41 files changed

+121
-180
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.5, 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.7, GemStone64-3.5.7, Squeak64-5.3 ]
1818
experimental: [ false ]
1919
include:
2020
- smalltalk: Pharo64-12

‎repository/BaselineOfGrease.package/.filetree‎

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

‎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/BaselineOfGrease.class/properties.json‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
{
2-
"category" : "BaselineOfGrease",
3-
"classinstvars" : [
4-
],
5-
"classvars" : [
6-
],
72
"commentStamp" : "",
8-
"instvars" : [
9-
],
10-
"name" : "BaselineOfGrease",
11-
"pools" : [
12-
],
133
"super" : "BaselineOf",
14-
"type" : "normal" }
4+
"category" : "BaselineOfGrease",
5+
"classinstvars" : [ ],
6+
"pools" : [ ],
7+
"classvars" : [ ],
8+
"instvars" : [ ],
9+
"name" : "BaselineOfGrease",
10+
"type" : "normal"
11+
}

‎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/BaselineOfGrease.package/properties.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
{
2-
}
1+
{ }

‎repository/Grease-Tests-Slime.package/GRSlimeTest.class/instance/compile.in..st‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
accessing-code
22
compile: aString in: aClass
3-
^ aClass compile: aString classified: #(accessing)
3+
4+
GRPlatform current
5+
compile: aString
6+
into: aClass
7+
classified: #accessing

‎repository/Grease-Tests-Slime.package/GRSlimeTest.class/instance/defineClass.superclass..st‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
accessing-code
22
defineClass: aClassSymbol superclass: aSuperSymbol
3-
| class |
4-
model defineClass: aSuperSymbol , ' subclass: #' , aClassSymbol , '
5-
instanceVariableNames: ''''
6-
classVariableNames: ''''
7-
poolDictionaries: ''''
8-
category: ''' , self category , ''''.
9-
class := model classNamed: aClassSymbol.
10-
environment
11-
addClass: class;
12-
addClass: class theMetaClass.
13-
^ class
3+
"For compatibility"
4+
^ self defineSubClassOf: aSuperSymbol

‎repository/Grease-Tests-Slime.package/GRSlimeTest.class/instance/defineSubClassOf..st‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
accessing-code
2+
defineSubClassOf: aSuperSymbol
3+
4+
| class |
5+
class := SystemVersion current major >= 12
6+
ifTrue: [
7+
factory make: [ :aBuilder |
8+
aBuilder
9+
superclass: (Smalltalk at: aSuperSymbol);
10+
package: self category ] ]
11+
ifFalse: [
12+
factory
13+
newSubclassOf: (Smalltalk at: aSuperSymbol)
14+
instanceVariableNames: ''
15+
classVariableNames: 'classVarsString'
16+
category: self category ].
17+
environment
18+
addClass: class;
19+
addClass: class theMetaClass.
20+
^ class

‎repository/Grease-Tests-Slime.package/GRSlimeTest.class/instance/setUp.st‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
running
22
setUp
33
super setUp.
4+
factory := ClassFactoryForTestCase new.
45
model := RBNamespace new.
56
environment := RBClassEnvironment new

0 commit comments

Comments
 (0)
X Tutup