Skip to content

Commit d2542fb

Browse files
chisandreichisandrei
authored
Merge pull request #1 from feenkcom/feenk
Merge feenk branch in release branch
2 parents ef21e41 + 23414e5 commit d2542fb

File tree

263 files changed

+414
-562
lines changed

Some content is hidden

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

263 files changed

+414
-562
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
smalltalk: [ Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, Pharo-6.1, GemStone64-3.6.1, GemStone64-3.5.6, 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 ]
11+
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 ]
1212
experimental: [ false ]
1313
include:
1414
- smalltalk: Squeak64-trunk

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ baselinePharo: spec
4545
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
4646

4747
spec
48-
for: #'pharo9.x'
48+
for: #(#'pharo9.x')
4949
do: [
5050
spec
5151
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo90-Core') ];
@@ -58,6 +58,24 @@ baselinePharo: spec
5858
package: 'Grease-Pharo90-Slime' with: [ spec requires: #('Grease-Core') ];
5959
package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Pharo90-Slime') ].
6060

61+
spec
62+
group: 'Slime' with: #('Grease-Pharo90-Slime');
63+
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
64+
65+
spec
66+
for: #(#'pharo10.x')
67+
do: [
68+
spec
69+
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo100-Core') ];
70+
package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
71+
package: 'Grease-Tests-Core'
72+
with: [ spec
73+
requires: #('Grease-Pharo100-Core');
74+
includes: #('Grease-Tests-Pharo-Core') ];
75+
package: 'Grease-Pharo100-Core' with: [ spec requires: #('Grease-Core') ];
76+
package: 'Grease-Pharo90-Slime' with: [ spec requires: #('Grease-Core') ];
77+
package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Pharo90-Slime') ].
78+
6179
spec
6280
group: 'Slime' with: #('Grease-Pharo90-Slime');
6381
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].

repository/Grease-Pharo30-Core.package/.filetree renamed to repository/BaselineOfGreaseForGToolkit.package/.filetree

File renamed without changes.

repository/Grease-Pharo30-Core.package/GRPharoGenericCodec.class/README.md renamed to repository/BaselineOfGreaseForGToolkit.package/BaselineOfGreaseForGToolkit.class/README.md

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
baselines
2+
baseline: spec
3+
<baseline>
4+
5+
spec
6+
for: #common
7+
do: [
8+
spec blessing: #baseline.
9+
10+
spec
11+
package: 'Grease-Core';
12+
package: 'Grease-Tests-Pharo-Core' with: [
13+
spec requires: #('Grease-Tests-Core') ];
14+
package: 'Grease-Tests-Core' with: [
15+
spec requires: #('Grease-Pharo90-Core') ];
16+
package: 'Grease-Pharo90-Core' with: [ spec requires: #('Grease-Core') ];
17+
package: 'Grease-Pharo90-Slime' with: [ spec requires: #('Grease-Core') ];
18+
package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Pharo90-Slime') ] ]

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
accessing
2+
projectClass
3+
Smalltalk at: #'MetacelloCypressBaselineProject' ifPresent: [ :cl | ^ cl ].
4+
^ super projectClass

‎repository/BaselineOfGreaseForGToolkit.package/BaselineOfGreaseForGToolkit.class/properties.json‎

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SystemOrganization addCategory: #BaselineOfGreaseForGToolkit!

repository/Grease-Pharo30-Core.package/monticello.meta/initializers.st renamed to repository/BaselineOfGreaseForGToolkit.package/monticello.meta/initializers.st

File renamed without changes.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
(name 'BaselineOfGreaseForGToolkit')

0 commit comments

Comments
 (0)