From 368d592d16113683d8a1a74aab1b7ef68641d201 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 20 Jul 2024 17:05:58 +0200 Subject: [PATCH 1/5] Use Seaside's JSON support instead of STON to read/write JSON per default on any platform, remove the use of STON in Pharo --- .../BPSmalltalkPlatform.class/instance/jsonRead..st | 5 +++-- .../BPSmalltalkPlatform.class/instance/jsonWrite..st | 5 +++-- .../BPPharoPlatform.class/instance/jsonRead..st | 4 ---- .../BPPharoPlatform.class/instance/jsonWrite..st | 4 ---- .../Parasol-Pharo9.package/monticello.meta/categories.st | 2 +- 5 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 repository/Parasol-Pharo9.package/BPPharoPlatform.class/instance/jsonRead..st delete mode 100644 repository/Parasol-Pharo9.package/BPPharoPlatform.class/instance/jsonWrite..st diff --git a/repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonRead..st b/repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonRead..st index 896d7eb..77dd072 100644 --- a/repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonRead..st +++ b/repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonRead..st @@ -1,3 +1,4 @@ facade -jsonRead: aString - self subclassResponsibility \ No newline at end of file +jsonRead: aString + + ^ WAJsonParser parse: aString \ No newline at end of file diff --git a/repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonWrite..st b/repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonWrite..st index 182eddd..5df4ff0 100644 --- a/repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonWrite..st +++ b/repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonWrite..st @@ -1,3 +1,4 @@ facade -jsonWrite: aDictionary - self subclassResponsibility \ No newline at end of file +jsonWrite: anObject + + ^ anObject asJson \ No newline at end of file diff --git a/repository/Parasol-Pharo9.package/BPPharoPlatform.class/instance/jsonRead..st b/repository/Parasol-Pharo9.package/BPPharoPlatform.class/instance/jsonRead..st deleted file mode 100644 index 7a702fa..0000000 --- a/repository/Parasol-Pharo9.package/BPPharoPlatform.class/instance/jsonRead..st +++ /dev/null @@ -1,4 +0,0 @@ -facade -jsonRead: aString - - ^ STONJSON fromString: aString diff --git a/repository/Parasol-Pharo9.package/BPPharoPlatform.class/instance/jsonWrite..st b/repository/Parasol-Pharo9.package/BPPharoPlatform.class/instance/jsonWrite..st deleted file mode 100644 index 5997d40..0000000 --- a/repository/Parasol-Pharo9.package/BPPharoPlatform.class/instance/jsonWrite..st +++ /dev/null @@ -1,4 +0,0 @@ -facade -jsonWrite: anObject - - ^ STONJSON toString: anObject diff --git a/repository/Parasol-Pharo9.package/monticello.meta/categories.st b/repository/Parasol-Pharo9.package/monticello.meta/categories.st index 0b83780..2a3c0a7 100644 --- a/repository/Parasol-Pharo9.package/monticello.meta/categories.st +++ b/repository/Parasol-Pharo9.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #'Parasol-Pharo9'! +self packageOrganizer ensurePackage: #'Parasol-Pharo9' withTags: #()! From 9bbacedccd3e2df23d715f279da7de782e791054 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 20 Jul 2024 17:10:33 +0200 Subject: [PATCH 2/5] 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 From 24b867acdd28a58eaa9e7578f9b89bca7e2061e9 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 20 Jul 2024 17:27:34 +0200 Subject: [PATCH 3/5] Remove overrides for Json read/write in GemStone (also drops use of deprecated JsJSONParser) --- .../BPGemStonePlatform.class/instance/jsonRead..st | 3 --- .../BPGemStonePlatform.class/instance/jsonWrite..st | 4 ---- 2 files changed, 7 deletions(-) delete mode 100644 repository/Parasol-GemStone.package/BPGemStonePlatform.class/instance/jsonRead..st delete mode 100644 repository/Parasol-GemStone.package/BPGemStonePlatform.class/instance/jsonWrite..st diff --git a/repository/Parasol-GemStone.package/BPGemStonePlatform.class/instance/jsonRead..st b/repository/Parasol-GemStone.package/BPGemStonePlatform.class/instance/jsonRead..st deleted file mode 100644 index 68847a4..0000000 --- a/repository/Parasol-GemStone.package/BPGemStonePlatform.class/instance/jsonRead..st +++ /dev/null @@ -1,3 +0,0 @@ -facade -jsonRead: aString - ^JSJsonParser parse: aString \ No newline at end of file diff --git a/repository/Parasol-GemStone.package/BPGemStonePlatform.class/instance/jsonWrite..st b/repository/Parasol-GemStone.package/BPGemStonePlatform.class/instance/jsonWrite..st deleted file mode 100644 index c0027a8..0000000 --- a/repository/Parasol-GemStone.package/BPGemStonePlatform.class/instance/jsonWrite..st +++ /dev/null @@ -1,4 +0,0 @@ -facade -jsonWrite: anObject - - ^anObject asJson \ No newline at end of file From 5368d274f4cf661aa0cf845610b8f5556506f3cc Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 20 Jul 2024 17:28:59 +0200 Subject: [PATCH 4/5] Remove overrides for Json read/write in Squeak (also drops use of deprecated JsJSONParser) --- .../BPSqueakPlatform.class/instance/jsonRead..st | 3 --- .../BPSqueakPlatform.class/instance/jsonWrite..st | 4 ---- 2 files changed, 7 deletions(-) delete mode 100644 repository/Parasol-Squeak.package/BPSqueakPlatform.class/instance/jsonRead..st delete mode 100644 repository/Parasol-Squeak.package/BPSqueakPlatform.class/instance/jsonWrite..st diff --git a/repository/Parasol-Squeak.package/BPSqueakPlatform.class/instance/jsonRead..st b/repository/Parasol-Squeak.package/BPSqueakPlatform.class/instance/jsonRead..st deleted file mode 100644 index 68847a4..0000000 --- a/repository/Parasol-Squeak.package/BPSqueakPlatform.class/instance/jsonRead..st +++ /dev/null @@ -1,3 +0,0 @@ -facade -jsonRead: aString - ^JSJsonParser parse: aString \ No newline at end of file diff --git a/repository/Parasol-Squeak.package/BPSqueakPlatform.class/instance/jsonWrite..st b/repository/Parasol-Squeak.package/BPSqueakPlatform.class/instance/jsonWrite..st deleted file mode 100644 index c0027a8..0000000 --- a/repository/Parasol-Squeak.package/BPSqueakPlatform.class/instance/jsonWrite..st +++ /dev/null @@ -1,4 +0,0 @@ -facade -jsonWrite: anObject - - ^anObject asJson \ No newline at end of file From 1c7e4f2b453deb97347b22946ff7f01e166ef91d Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 20 Jul 2024 17:45:20 +0200 Subject: [PATCH 5/5] remove STON project from baseline --- .../BaselineOfParasol.class/instance/baseline..st | 3 --- 1 file changed, 3 deletions(-) diff --git a/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/baseline..st b/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/baseline..st index c8678b0..fcbff38 100644 --- a/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/baseline..st +++ b/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/baseline..st @@ -5,9 +5,6 @@ baseline: spec spec for: #'common' do: [ - spec - baseline: 'Ston' - with: [ spec repository: 'github://svenvc/ston/repository' ]. spec package: 'Parasol-Core'; package: 'Parasol-Seaside' with: [ spec requires: #('Parasol-Core') ];