From 9e5c7bb76c5b5de6ebe748a30b136070de76ed36 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 20 Apr 2024 13:49:10 +0200 Subject: [PATCH] Update Grease to v1.18.x --- .../BaselineOfSeaside3.class/instance/baseline..st | 4 ++-- .../instance/baselineadaptors..st | 1 + .../BaselineOfSeaside3.class/instance/baselinecommon..st | 8 +++----- .../instance/baselinefilesystem..st | 1 + .../instance/baselinegemstone..st | 1 + .../BaselineOfSeaside3.class/instance/baselineob..st | 1 + .../BaselineOfSeaside3.class/instance/baselinerest..st | 8 ++++---- .../instance/baselinesecurity..st | 1 + .../BaselineOfSeaside3.class/instance/projectClass.st | 1 + .../instance/startWelcomeSeasideAdaptorInPharo.st | 1 + .../instance/startWelcomeSeasideAdaptorInSqueak.st | 1 + 11 files changed, 17 insertions(+), 11 deletions(-) diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baseline..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baseline..st index 062bbd615..e21eb26bf 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baseline..st +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baseline..st @@ -1,8 +1,8 @@ baselines baseline: spec - + "This groups all baselines" - "This groups all baseline" + self baselinecommon: spec. self baselinegemstone: spec. self baselinepharo: spec. diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselineadaptors..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselineadaptors..st index f6d8e4f17..7207f12e7 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselineadaptors..st +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselineadaptors..st @@ -1,5 +1,6 @@ baselines baselineadaptors: spec + spec for: #( #squeakCommon #'gs3.0.x' #'gs3.1.x' #'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' ) do: [ spec diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinecommon..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinecommon..st index 99409595f..194ad01f6 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinecommon..st +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinecommon..st @@ -7,11 +7,10 @@ baselinecommon: spec with: [ spec loads: #('Grease-Core'); - repository: 'github://SeasideSt/Grease:v1.17.x/repository' ]. + repository: 'github://SeasideSt/Grease:v1.18.x/repository' ]. spec project: 'Grease Core Tests' copyFrom: 'Grease' with: [ - spec loads: #('Core Tests') ] - ]. + spec loads: #('Core Tests') ] ]. spec for: #'gemstone' do: [ spec @@ -22,8 +21,7 @@ baselinecommon: spec repository: 'github://GsDevKit/Grease:master/repository' ]. spec project: 'Grease Core Tests' copyFrom: 'Grease' with: [ - spec loads: #('Core Tests') ] - ]. + spec loads: #('Core Tests') ] ]. spec for: #'common' do: [ spec diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinefilesystem..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinefilesystem..st index ce8d31c3a..9c71aebeb 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinefilesystem..st +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinefilesystem..st @@ -1,5 +1,6 @@ baselines baselinefilesystem: spec + spec for: #'common' do: [ diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegemstone..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegemstone..st index 013ecb4c5..7eb9b1f75 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegemstone..st +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinegemstone..st @@ -1,5 +1,6 @@ baselines baselinegemstone: spec + spec for: #'gemstone' do: [ diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselineob..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselineob..st index 351c75d78..53ef2a538 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselineob..st +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselineob..st @@ -1,5 +1,6 @@ baselines baselineob: spec + spec for: #squeak do: [ spec diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinerest..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinerest..st index bfdb05510..4f591ec15 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinerest..st +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinerest..st @@ -31,7 +31,7 @@ baselinerest: spec spec package: 'Seaside-Squeak-REST-Core'; package: 'Seaside-REST-Core' with:[ - spec includes: #('Seaside-Squeak-REST-Core')]; + spec includes: #('Seaside-Squeak-REST-Core') ]; package: 'Seaside-Squeak-Swagger-Core'; package: 'Seaside-Pharo-Swagger-Core'; package: 'Seaside-Swagger-Core' with: [ @@ -44,7 +44,7 @@ baselinerest: spec spec package: 'Seaside-Pharo20-REST-Core'; package: 'Seaside-REST-Core' with:[ - spec includes: #('Seaside-Pharo20-REST-Core')]; + spec includes: #('Seaside-Pharo20-REST-Core') ]; package: 'Seaside-Pharo-Swagger-Core'; package: 'Seaside-Swagger-Core' with: [ spec includes: #('Seaside-Pharo-Swagger-Core') ] @@ -56,7 +56,7 @@ baselinerest: spec spec package: 'Seaside-Pharo90-REST-Core'; package: 'Seaside-REST-Core' with:[ - spec includes: #('Seaside-Pharo90-REST-Core')]; + spec includes: #('Seaside-Pharo90-REST-Core') ]; package: 'Seaside-Pharo-Swagger-Core'; package: 'Seaside-Swagger-Core' with: [ spec includes: #('Seaside-Pharo-Swagger-Core') ] @@ -67,7 +67,7 @@ baselinerest: spec package: 'Seaside-GemStone-REST-Core' with: [ spec requires: #('Seaside-Core') ]; package: 'Seaside-REST-Core' with:[ - spec includes: #('Seaside-GemStone-REST-Core')] + spec includes: #('Seaside-GemStone-REST-Core') ] ]. spec for: #'gs3.x' do:[ diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinesecurity..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinesecurity..st index 3facec569..82bd28c5d 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinesecurity..st +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinesecurity..st @@ -1,5 +1,6 @@ baselines baselinesecurity: spec + spec for: #squeakCommon do: [ spec diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/projectClass.st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/projectClass.st index 1d4f6564d..430260fb5 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/projectClass.st +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/projectClass.st @@ -1,4 +1,5 @@ accessing projectClass + Smalltalk at: #'MetacelloCypressBaselineProject' ifPresent: [ :cl | ^ cl ]. ^ super projectClass \ No newline at end of file diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/startWelcomeSeasideAdaptorInPharo.st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/startWelcomeSeasideAdaptorInPharo.st index 84664bdbf..9f47334be 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/startWelcomeSeasideAdaptorInPharo.st +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/startWelcomeSeasideAdaptorInPharo.st @@ -1,5 +1,6 @@ doits startWelcomeSeasideAdaptorInPharo + (Smalltalk globals at: #WAAdmin) defaultServerManager adaptors ifEmpty: [ (Smalltalk globals includesKey: #ZnZincServerAdaptor) ifTrue: [ (Smalltalk globals at: #ZnZincServerAdaptor) startOn: 8080 ] ] \ No newline at end of file diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/startWelcomeSeasideAdaptorInSqueak.st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/startWelcomeSeasideAdaptorInSqueak.st index 74b583ad9..8b25a8715 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/startWelcomeSeasideAdaptorInSqueak.st +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/startWelcomeSeasideAdaptorInSqueak.st @@ -1,5 +1,6 @@ doits startWelcomeSeasideAdaptorInSqueak + (Smalltalk globals at: #WAAdmin) defaultServerManager adaptors ifEmpty: [ (Smalltalk globals includesKey: #WAWebServerAdaptor) ifTrue: [ ((Smalltalk globals at: #WAWebServerAdaptor) port: 8080)