From 368d592d16113683d8a1a74aab1b7ef68641d201 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Sat, 20 Jul 2024 17:05:58 +0200 Subject: [PATCH] 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: #()!