Skip to content

Commit

Permalink
Merge pull request #1413 from SeasideSt/grease-update
Browse files Browse the repository at this point in the history
Update Grease to v1.18.x
  • Loading branch information
jbrichau authored Apr 20, 2024
2 parents 3c2b910 + 9e5c7bb commit 7a76a2b
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
baselines
baseline: spec

"This groups all baselines"
<baseline>
"This groups all baseline"

self baselinecommon: spec.
self baselinegemstone: spec.
self baselinepharo: spec.
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
baselines
baselinefilesystem: spec

spec
for: #'common'
do: [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
baselines
baselinegemstone: spec

spec
for: #'gemstone'
do: [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
baselines
baselineob: spec

spec
for: #squeak
do: [ spec
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand All @@ -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') ]
Expand All @@ -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') ]
Expand All @@ -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:[
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
baselines
baselinesecurity: spec

spec
for: #squeakCommon
do: [ spec
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
accessing
projectClass

Smalltalk at: #'MetacelloCypressBaselineProject' ifPresent: [ :cl | ^ cl ].
^ super projectClass
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
doits
startWelcomeSeasideAdaptorInPharo

(Smalltalk globals at: #WAAdmin) defaultServerManager adaptors
ifEmpty: [ (Smalltalk globals includesKey: #ZnZincServerAdaptor)
ifTrue: [ (Smalltalk globals at: #ZnZincServerAdaptor) startOn: 8080 ] ]
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
doits
startWelcomeSeasideAdaptorInSqueak

(Smalltalk globals at: #WAAdmin) defaultServerManager adaptors
ifEmpty: [ (Smalltalk globals includesKey: #WAWebServerAdaptor)
ifTrue: [ ((Smalltalk globals at: #WAWebServerAdaptor) port: 8080)
Expand Down

0 comments on commit 7a76a2b

Please sign in to comment.