X Tutup
Skip to content

Commit dcad886

Browse files
dalehenrichdalehenrich
authored
Merge pull request #36 from SeasideSt/gsdevkit-merge
Sync with Grease master ... the merge CI job failed, but pharo14 is an "expected failure" and the slack reporting issue may work fine when it runs as me ... if not I'll debug the CI issues later
2 parents e65dbc1 + af91b2b commit dcad886

File tree

486 files changed

+250
-2206
lines changed

Some content is hidden

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

486 files changed

+250
-2206
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ baselinePharo: spec
5252
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
5353

5454
spec
55-
for: #(#'pharo10.x' #'pharo11.x' #'pharo12.x' #'pharo13.x')
55+
for: #(#'pharo10.x' #'pharo11.x' #'pharo12.x' #'pharo13.x' #'pharo14.x')
5656
do: [
5757
spec
5858
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo100-Core') ];

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

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,5 @@
11
baselines
22
baselineSqueak: spec
3-
spec
4-
for: #(#'squeak5.x')
5-
do: [
6-
spec
7-
project: 'Refactoring-Core'
8-
with: [ spec
9-
className: 'ConfigurationOfRefactoringBrowser';
10-
versionString: #stable;
11-
loads: #('Core');
12-
repository: 'http://www.squeaksource.com/MetacelloRepository' ].
13-
spec
14-
package: 'Grease-Core'
15-
with: [ spec includes: #('Grease-Squeak5-Core') ];
16-
package: 'Grease-Tests-Core'
17-
with: [ spec
18-
requires: #('Grease-Squeak5-Core');
19-
includes: #('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak5-Core') ];
20-
package: 'Grease-Squeak5-Core'
21-
with: [ spec requires: #('Grease-Core') ];
22-
package: 'Grease-Tests-Squeak-Core'
23-
with: [ spec requires: #('Grease-Tests-Core') ];
24-
package: 'Grease-Tests-Squeak5-Core'
25-
with: [ spec requires: #('Grease-Tests-Squeak-Core') ] ].
263
spec
274
for: #(#'squeak6.x')
285
do: [
@@ -39,10 +16,8 @@ baselineSqueak: spec
3916
package: 'Grease-Tests-Core'
4017
with: [ spec
4118
requires: #('Grease-Squeak6-Core');
42-
includes: #('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak6-Core') ];
19+
includes: #('Grease-Tests-Squeak6-Core') ];
4320
package: 'Grease-Squeak6-Core'
4421
with: [ spec requires: #('Grease-Core') ];
45-
package: 'Grease-Tests-Squeak-Core'
46-
with: [ spec requires: #('Grease-Tests-Core') ];
4722
package: 'Grease-Tests-Squeak6-Core'
48-
with: [ spec requires: #('Grease-Tests-Squeak-Core') ] ]
23+
with: [ spec requires: #('Grease-Tests-Core') ] ]

repository/Grease-Squeak5-Core.package/GRDelegatingStream.extension/instance/greaseNext.putAll.startingAt..st renamed to repository/Grease-Core.package/GRDelegatingStream.class/instance/greaseNext.putAll.startingAt..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
*grease-squeak5-core
1+
streaming
22
greaseNext: anInteger putAll: aCollection startingAt: startIndex
33
stream greaseNext: anInteger putAll: aCollection startingAt: startIndex

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
accessing-repositories
22
greaseUrl
3-
^ 'http://smalltalkhub.com/mc/Seaside/Grease11/main'
3+
"The original URL: http://smalltalkhub.com/mc/Seaside/Grease11/main"
4+
^ 'https://github.com/SeasideSt/Grease'

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
accessing-repositories
22
seasideAddonsUrl
3-
^ 'http://smalltalkhub.com/mc/Seaside/Seaside30Addons/main'
3+
"The original URL http://smalltalkhub.com/mc/Seaside/Seaside30Addons/main"
4+
^ 'https://github.com/SeasideSt/Seaside'

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
accessing-repositories
22
seasideLGPLUrl
3-
^ 'http://smalltalkhub.com/mc/Seaside/Seaside30LGPL/main'
3+
"The original URL: http://smalltalkhub.com/mc/Seaside/Seaside31/main"
4+
^ 'https://github.com/SeasideSt/Seaside'

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
accessing-repositories
22
seasideUrl
3-
^ 'http://smalltalkhub.com/mc/Seaside/Seaside31/main'
3+
"The original URL: http://smalltalkhub.com/mc/Seaside/Seaside31/main"
4+
^ 'https://github.com/SeasideSt/Seaside'

‎repository/Grease-Core.package/GRPlatform.class/instance/compile.into.classified..st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
file library
1+
meta-object-protocol
22
compile: aString into: aClass classified: aSymbol
33
"The trick here is to be as silently a possible so that the package is not marked dirty when running WAFileLibrary test.
44
This also makes running tests much faster."

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
testing
2+
isGemStone
3+
4+
^ false

0 commit comments

Comments
 (0)
X Tutup