From 9bbacedccd3e2df23d715f279da7de782e791054 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 20 Jul 2024 17:10:33 +0200 Subject: [PATCH] Drop dependency on STON in baseline + remove gemstone 2.4 loading --- .../instance/baseline..st | 30 +++++++++---------- .../instance/projectClass.st | 1 + 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/baseline..st b/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/baseline..st index 44fda0b..c8678b0 100644 --- a/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/baseline..st +++ b/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/baseline..st @@ -1,6 +1,7 @@ baselines baseline: spec + spec for: #'common' do: [ @@ -17,6 +18,7 @@ baseline: spec group: 'default' with: #('Parasol-Seaside' 'Parasol-Convenience'); group: 'core' with: #('Parasol-Core' 'Parasol-Convenience'); group: 'tests' with: #('Parasol-Tests' 'default') ]. + spec for: #'loadSeaside' do: [ @@ -42,20 +44,25 @@ baseline: spec spec package: 'Parasol-Squeak'; package: 'Parasol-Core' with: [ spec includes: #('Parasol-Squeak') ] ]. + spec for: #(#'pharo6.x' #'pharo7.x' #'pharo8.x') do: [ spec - package: 'Parasol-Pharo' - with: [ spec requires: #('Parasol-Core' 'Ston') ]; - package: 'Parasol-Core' with: [ spec includes: #('Parasol-Pharo') ] ]. + package: 'Parasol-Pharo' + with: [ spec requires: #('Parasol-Core') ]; + package: 'Parasol-Core' + with: [ spec includes: #('Parasol-Pharo') ] ]. + spec for: #('pharo9.x' 'pharo10.x' 'pharo11.x' 'pharo12.x' 'pharo13.x') do: [ spec - package: 'Parasol-Pharo9' - with: [ spec requires: #('Parasol-Core' 'Ston') ]; - package: 'Parasol-Core' with: [ spec includes: #('Parasol-Pharo9') ] ]. + package: 'Parasol-Pharo9' + with: [ spec requires: #('Parasol-Core') ]; + package: 'Parasol-Core' + with: [ spec includes: #('Parasol-Pharo9') ] ]. + spec for: #'gemstone' do: [ @@ -67,16 +74,7 @@ baseline: spec spec includes: #('Parasol-GemStone'); requires: #('ZincHTTP') ] ]. - spec - for: #'gs2.4.x' - do: [ - spec - baseline: 'ZincHTTP' - with: [ - spec - className: 'BaselineOfZinc'; - loads: 'Core'; - repository: 'github://GsDevKit/zinc:2.3.2_gs2.4/repository' ] ]. + spec for: #'gs3.x' do: [ diff --git a/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/projectClass.st b/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/projectClass.st index 1d4f656..430260f 100644 --- a/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/projectClass.st +++ b/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/projectClass.st @@ -1,4 +1,5 @@ accessing projectClass + Smalltalk at: #'MetacelloCypressBaselineProject' ifPresent: [ :cl | ^ cl ]. ^ super projectClass \ No newline at end of file