X Tutup
Skip to content

Commit 34b364a

Browse files
chisandreichisandrei
committed
Merge branch 'feenk' into release
2 parents ef51e37 + 3cf3fcf commit 34b364a

File tree

851 files changed

+2502
-2278
lines changed

Some content is hidden

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

851 files changed

+2502
-2278
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
name: smalltalkCI
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
pull_request:
6+
schedule:
7+
- cron: "5 0 * * 1" # At 00:05 on Monday.
48

59
jobs:
610
test:
7-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-latest
812
strategy:
913
fail-fast: false
1014
matrix:
11-
smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.6.5, GemStone64-3.5.7, Squeak64-5.3 ]
15+
smalltalk: [ Pharo64-13, Pharo64-12, Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.1, GemStone64-3.6.8, GemStone64-3.5.8, Squeak64-6.0 ]
1216
experimental: [ false ]
1317
include:
14-
- smalltalk: Squeak64-6.0
18+
- smalltalk: Pharo64-14
1519
experimental: true
1620
continue-on-error: ${{ matrix.experimental }}
1721
name: ${{ matrix.smalltalk }}
1822
steps:
19-
- uses: actions/checkout@v3
20-
- uses: dalehenrich/setup-smalltalkCI@solo
23+
- uses: actions/checkout@v4
24+
- uses: hpi-swa/setup-smalltalkCI@v1
2125
with:
2226
smalltalk-image: ${{ matrix.smalltalk }}
2327
- name: Run tests
@@ -27,6 +31,7 @@ jobs:
2731
shell: bash
2832
timeout-minutes: 20
2933
- name: Upload coverage to Codecov
30-
uses: codecov/codecov-action@v3
34+
uses: codecov/codecov-action@v4
3135
with:
3236
name: ${{ matrix.smalltalk }}
37+
token: ${{ secrets.CODECOV_TOKEN }}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Grease is widely adopted. Implementations exist already for all platforms that s
1616

1717
## Platform compatibility
1818

19-
The latest Grease version is supported on the Pharo and GemStone/S platforms and versions tested in the SmalltalkCI workflow in Github Actions: [![smalltalkCI](https://github.com/SeasideSt/Grease/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/SeasideSt/Grease/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/SeasideSt/Grease/branch/master/graph/badge.svg?token=75NIYAHAGI)](https://codecov.io/gh/SeasideSt/Grease)
19+
The latest Grease version is supported on the Pharo, GemStone/S, Squeak, and VAST (not part of this repository) platforms and versions tested in the SmalltalkCI workflow in Github Actions: [![smalltalkCI](https://github.com/SeasideSt/Grease/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/SeasideSt/Grease/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/SeasideSt/Grease/branch/master/graph/badge.svg?token=75NIYAHAGI)](https://codecov.io/gh/SeasideSt/Grease)
2020

2121
## Installation
2222

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

Lines changed: 3 additions & 1 deletion
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.
@@ -13,4 +14,5 @@ baselineCommon: spec
1314
group: 'Slime' with: #('Core');
1415
group: 'Slime Tests' with: #('Core Tests');
1516
group: 'Tests' with: #('Core Tests' 'Slime Tests');
16-
group: 'default' with: #('Slime') ]
17+
group: 'default' with: #('Slime');
18+
group: 'Development' with: #('default') ]

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

Lines changed: 13 additions & 2 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: [
@@ -97,7 +98,7 @@ baselineGemStone: spec
9798
with: [ spec includes: 'Grease-Tests-GemStone-Core' ] ].
9899

99100
spec
100-
for: #( #'gs3.5.4.x' #'gs3.5.5.x' #'gs3.5.6.x' #'gs3.5.7.x' )
101+
for: #( #'gs3.5.4.x' #'gs3.5.5.x' #'gs3.5.6.x' #'gs3.5.7.x' #'gs3.5.8.x' #'gs3.5.9.x' )
101102
do: [
102103
spec
103104
package: 'Grease-GemStone-Core'
@@ -116,11 +117,21 @@ baselineGemStone: spec
116117
with: [
117118
spec
118119
requires: #('Grease-GemStone-Core') ] ].
120+
spec
121+
for: #( #'gs3.7.x' #'gs3.8.x' #'gs3.9.x')
122+
do: [
123+
spec
124+
package: 'Grease-GemStone-Core'
125+
with: [ spec includes: #('Grease-GemStone-Kernelv370') ];
126+
package: 'Grease-GemStone-Kernelv370'
127+
with: [
128+
spec
129+
requires: #('Grease-GemStone-Core') ] ].
119130
spec
120131
for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x' #'gs3.7.x' #'gs3.8.x' #'gs3.9.x')
121132
do: [
122133
spec
123134
package: 'Grease-Tests-GemStone32-Core'
124135
with:[ spec requires: 'Grease-Tests-Core' ];
125136
package: 'Grease-Tests-Core'
126-
with: [ spec includes: 'Grease-Tests-GemStone32-Core' ] ]
137+
with: [ spec includes: 'Grease-Tests-GemStone32-Core' ] ]

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

Lines changed: 8 additions & 5 deletions
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')
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') ];
@@ -62,9 +62,12 @@ 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-Core' with: [ spec requires: #('Grease-Core') ];
66+
package: 'Grease-Pharo110-Slime-Portability' with: [ spec requires: #('Grease-Pharo110-Slime-Core') ];
67+
package: 'Grease-Tests-Pharo-Slime' with: [ spec requires: #('Grease-Pharo110-Slime-Portability') ].
6768

6869
spec
69-
group: 'Slime' with: #('Grease-Pharo90-Slime');
70-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ]
70+
group: 'Slime' with: #('Grease-Pharo110-Slime-Core');
71+
group: 'Slime Portability' with: #('Slime' 'Grease-Pharo110-Slime-Portability');
72+
group: 'Slime Tests' with: #('Grease-Pharo110-Slime-Portability' 'Grease-Tests-Pharo-Slime');
73+
group: 'Development' with: #('Slime Portability') ]

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

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +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') ];
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') ].
333
spec
344
for: #(#'squeak6.x')
355
do: [
@@ -46,17 +16,8 @@ baselineSqueak: spec
4616
package: 'Grease-Tests-Core'
4717
with: [ spec
4818
requires: #('Grease-Squeak6-Core');
49-
includes: #('Grease-Tests-Squeak-Core' 'Grease-Tests-Squeak6-Core') ];
19+
includes: #('Grease-Tests-Squeak6-Core') ];
5020
package: 'Grease-Squeak6-Core'
5121
with: [ spec requires: #('Grease-Core') ];
52-
package: 'Grease-Tests-Squeak-Core'
53-
with: [ spec requires: #('Grease-Tests-Core') ];
5422
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') ]
23+
with: [ spec requires: #('Grease-Tests-Core') ] ]

‎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: #()!

‎repository/BaselineOfGreaseForGToolkit.package/BaselineOfGreaseForGToolkit.class/instance/baseline..st‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ baseline: spec
1010
package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
1111
package: 'Grease-Tests-Core' with: [ spec requires: #('Grease-Pharo100-Core')];
1212
package: 'Grease-Pharo100-Core' with: [ spec requires: #('Grease-Core') ];
13-
package: 'Grease-Pharo90-Slime' with: [ spec requires: #('Grease-Core') ];
14-
package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Pharo90-Slime') ] ]
13+
package: 'Grease-Pharo110-Slime-Core' with: [ spec requires: #('Grease-Core') ];
14+
package: 'Grease-Pharo110-Slime-Portability' with: [ spec requires: #('Grease-Pharo110-Slime-Core') ];
15+
package: 'Grease-Tests-Pharo-Slime' with: [ spec requires: #('Grease-Pharo110-Slime-Portability') ] ]

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

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

‎repository/Grease-Core.package/Collection.extension/instance/greaseAsByteArray.st‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*Grease-Core
2+
greaseAsByteArray
3+
^ self asByteArray

0 commit comments

Comments
 (0)
X Tutup