Skip to content

Commit

Permalink
Merge pull request #35 from SeasideSt/gsdevkitsync
Browse files Browse the repository at this point in the history
Keep GsDevKit/Grease up to date with Seaside/Grease
  • Loading branch information
dalehenrich authored Aug 18, 2024
2 parents 1c70803 + 868de8a commit 6b1e641
Show file tree
Hide file tree
Showing 316 changed files with 722 additions and 348 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ jobs:
strategy:
fail-fast: false
matrix:
smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.0, GemStone64-3.7.1, GemStone64-3.6.8, GemStone64-3.5.8, Squeak64-5.3 ]
smalltalk: [ Pharo64-12, Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.0, GemStone64-3.7.1, GemStone64-3.6.8, GemStone64-3.5.8, Squeak64-5.3 ]
experimental: [ false ]
include:
- smalltalk: Pharo64-12
- smalltalk: Pharo64-13
experimental: true
- smalltalk: Squeak64-6.0
experimental: true
continue-on-error: ${{ matrix.experimental }}
name: ${{ matrix.smalltalk }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: hpi-swa/setup-smalltalkCI@v1
with:
smalltalk-image: ${{ matrix.smalltalk }}
Expand All @@ -35,12 +35,13 @@ jobs:
shell: bash
timeout-minutes: 20
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
name: ${{ matrix.smalltalk }}
token: ${{ secrets.CODECOV_TOKEN }}
- name: Slack Workflow Notification
uses: Gamesight/slack-workflow-status@master
with:
repo_token: ${{secrets.GITHUB_TOKEN}}
slack_webhook_url: ${{secrets.SLACK_DALEHENRICH}}
name: 'action run'
name: 'action run'
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ baselineCommon: spec
group: 'Slime' with: #('Core');
group: 'Slime Tests' with: #('Core Tests');
group: 'Tests' with: #('Core Tests' 'Slime Tests');
group: 'default' with: #('Slime') ]
group: 'default' with: #('Slime');
group: 'Development' with: #('default') ]
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ baselinePharo: spec
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].

spec
for: #(#'pharo10.x' #'pharo11.x' #'pharo12.x')
for: #(#'pharo10.x' #'pharo11.x' #'pharo12.x' #'pharo13.x')
do: [
spec
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo100-Core') ];
Expand All @@ -62,9 +62,12 @@ baselinePharo: spec
requires: #('Grease-Pharo100-Core');
includes: #('Grease-Tests-Pharo-Core') ];
package: 'Grease-Pharo100-Core' with: [ spec requires: #('Grease-Core') ];
package: 'Grease-Pharo110-Slime' with: [ spec requires: #('Grease-Core') ];
package: 'Grease-Tests-Pharo-Slime' with: [ spec requires: #('Grease-Pharo110-Slime') ].
package: 'Grease-Pharo110-Slime-Core' with: [ spec requires: #('Grease-Core') ];
package: 'Grease-Pharo110-Slime-Portability' with: [ spec requires: #('Grease-Pharo110-Slime-Core') ];
package: 'Grease-Tests-Pharo-Slime' with: [ spec requires: #('Grease-Pharo110-Slime-Portability') ].

spec
group: 'Slime' with: #('Grease-Pharo110-Slime');
group: 'Slime Tests' with: #('Grease-Tests-Pharo-Slime') ]
group: 'Slime' with: #('Grease-Pharo110-Slime-Core');
group: 'Slime Portability' with: #('Slime' 'Grease-Pharo110-Slime-Portability');
group: 'Slime Tests' with: #('Grease-Pharo110-Slime-Portability' 'Grease-Tests-Pharo-Slime');
group: 'Development' with: #('Slime Portability') ]
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SystemOrganization addCategory: #BaselineOfGrease!
self packageOrganizer ensurePackage: #BaselineOfGrease withTags: #()!
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
private
encoding
supportsUnicode
"dynamically try to figure out whether the current dialect supports Unicode"

^ [
String
with: (Character value: 16r1F1F3)
with: (Character value: 16r1F1F1).
with: (Character codePoint: 16r1F1F3)
with: (Character codePoint: 16r1F1F1).
true
] on: Error
do: [ :error | false ]
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ version info
version
"Answer the Grease version"

^ (GRVersion major: 1 minor: 16 revision: 0)
^ (GRVersion major: 1 minor: 18 revision: 1)
yourself
6 changes: 1 addition & 5 deletions repository/Grease-Core.package/monticello.meta/categories.st
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
SystemOrganization addCategory: #'Grease-Core'!
SystemOrganization addCategory: #'Grease-Core-Collections'!
SystemOrganization addCategory: #'Grease-Core-Exceptions'!
SystemOrganization addCategory: #'Grease-Core-Text'!
SystemOrganization addCategory: #'Grease-Core-Utilities'!
self packageOrganizer ensurePackage: #'Grease-Core' withTags: #(#Collections #Exceptions #Text #Utilities)!
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
exceptions
deprecationExceptionSet
"Answer the exception set that should considered besides WADeprecation."
^ ExceptionSet new
add: Deprecation;
yourself
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commentStamp" : "",
"super" : "GRSlimeParseTreeLintRule",
"category" : "Grease-Pharo110-Slime",
"super" : "GRReSlimeParseTreeLintRule",
"category" : "Grease-Pharo110-Slime-Core",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
testing
isVisible

^ self name ~= #GRReSlimeBlockLintRule
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"commentStamp" : "",
"super" : "ReAbstractRule",
"category" : "Grease-Pharo110-Slime",
"category" : "Grease-Pharo110-Slime-Core",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "GRSlimeBlockLintRule",
"name" : "GRReSlimeBlockLintRule",
"type" : "normal"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
testing
isVisible

^ self name ~= #GRReSlimeParseTreeLintRule
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"commentStamp" : "",
"super" : "ReNodeMatchRule",
"category" : "Grease-Pharo110-Slime",
"category" : "Grease-Pharo110-Slime-Core",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "GRSlimeParseTreeLintRule",
"name" : "GRReSlimeParseTreeLintRule",
"type" : "normal"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
testing
isVisible

^ self name ~= #GRReSlimeTransformationRule
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"commentStamp" : "",
"super" : "ReNodeRewriteRule",
"category" : "Grease-Pharo110-Slime",
"category" : "Grease-Pharo110-Slime-Core",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "GRSlimeTransformationRule",
"name" : "GRReSlimeTransformationRule",
"type" : "normal"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
For compatibility for versions of Seaside older than 3.5.6
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"commentStamp" : "JohanBrichau 3/11/2024 21:54",
"super" : "RBBlockLintRule",
"category" : "Grease-Pharo110-Slime-Core",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "GRSlimeBlockLintRule",
"type" : "normal"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
For compatibility for versions of Seaside older than 3.5.6
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"commentStamp" : "JohanBrichau 3/11/2024 21:54",
"super" : "RBParseTreeLintRule",
"category" : "Grease-Pharo110-Slime-Core",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "GRSlimeParseTreeLintRule",
"type" : "normal"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
For compatibility for versions of Seaside older than 3.5.6
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"commentStamp" : "JohanBrichau 3/11/2024 21:54",
"super" : "RBTransformationRule",
"category" : "Grease-Pharo110-Slime-Core",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "GRSlimeTransformationRule",
"type" : "normal"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
self packageOrganizer ensurePackage: #'Grease-Pharo110-Slime-Core' withTags: #()!
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(name 'Grease-Pharo110-Slime-Core')
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"separateMethodMetaAndSource" : false,
"noMethodMetaData" : true,
"useCypressPropertiesFile" : true
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commentStamp" : "",
"super" : "GRSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime",
"super" : "GRReSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime-Portability",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commentStamp" : "",
"super" : "GRSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime",
"super" : "GRReSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime-Portability",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commentStamp" : "",
"super" : "GRSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime",
"super" : "GRReSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime-Portability",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commentStamp" : "",
"super" : "GRSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime",
"super" : "GRReSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime-Portability",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commentStamp" : "",
"super" : "GRSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime",
"super" : "GRReSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime-Portability",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commentStamp" : "",
"super" : "GRSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime",
"super" : "GRReSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime-Portability",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commentStamp" : "",
"super" : "GRSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime",
"super" : "GRReSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime-Portability",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commentStamp" : "",
"super" : "GRSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime",
"super" : "GRReSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime-Portability",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commentStamp" : "",
"super" : "GRSlimeBlockLintRule",
"category" : "Grease-Pharo110-Slime",
"super" : "GRReSlimeBlockLintRule",
"category" : "Grease-Pharo110-Slime-Portability",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commentStamp" : "",
"super" : "GRSlimeBlockLintRule",
"category" : "Grease-Pharo110-Slime",
"super" : "GRReSlimeBlockLintRule",
"category" : "Grease-Pharo110-Slime-Portability",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commentStamp" : "",
"super" : "GRSlimeBlockLintRule",
"category" : "Grease-Pharo110-Slime",
"super" : "GRReSlimeBlockLintRule",
"category" : "Grease-Pharo110-Slime-Portability",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commentStamp" : "",
"super" : "GRSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime",
"super" : "GRReSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime-Portability",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commentStamp" : "pmm 9/12/2009 10:37",
"super" : "GRSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime",
"super" : "GRReSlimeTransformationRule",
"category" : "Grease-Pharo110-Slime-Portability",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commentStamp" : "",
"super" : "GRUsesNotPortableClassRule",
"category" : "Grease-Pharo110-Slime",
"category" : "Grease-Pharo110-Slime-Portability",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"commentStamp" : "",
"super" : "GRUsesNotPortableClassRule",
"category" : "Grease-Pharo110-Slime",
"category" : "Grease-Pharo110-Slime-Portability",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
Expand Down
Loading

0 comments on commit 6b1e641

Please sign in to comment.