Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop ston dependency #68

Merged
merged 6 commits into from
Jul 23, 2024
Merged

Drop ston dependency #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
368d592
Use Seaside's JSON support instead of STON to read/write JSON per def…
jbrichau Jul 20, 2024
9bbaced
Drop dependency on STON in baseline + remove gemstone 2.4 loading
jbrichau Jul 20, 2024
24b867a
Remove overrides for Json read/write in GemStone (also drops use of d…
jbrichau Jul 20, 2024
5368d27
Remove overrides for Json read/write in Squeak (also drops use of dep…
jbrichau Jul 20, 2024
1c7e4f2
remove STON project from baseline
jbrichau Jul 20, 2024
a88b909
Merge 5368d274f4cf661aa0cf845610b8f5556506f3cc
jbrichau Jul 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 14 additions & 19 deletions repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/baseline..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
baselines
baseline: spec
<baseline>

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') ];
Expand All @@ -17,6 +15,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: [
Expand All @@ -42,20 +41,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: [
Expand All @@ -67,16 +71,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: [
Expand Down
1 change: 1 addition & 0 deletions repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/projectClass.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
accessing
projectClass

Smalltalk at: #'MetacelloCypressBaselineProject' ifPresent: [ :cl | ^ cl ].
^ super projectClass
5 changes: 3 additions & 2 deletions repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonRead..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
facade
jsonRead: aString
self subclassResponsibility
jsonRead: aString

^ WAJsonParser parse: aString
5 changes: 3 additions & 2 deletions repository/Parasol-Core.package/BPSmalltalkPlatform.class/instance/jsonWrite..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
facade
jsonWrite: aDictionary
self subclassResponsibility
jsonWrite: anObject

^ anObject asJson
5 changes: 3 additions & 2 deletions repository/Parasol-GemStone.package/.filetree
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"noMethodMetaData" : true,
"separateMethodMetaAndSource" : false,
"useCypressPropertiesFile" : true }
"noMethodMetaData" : true,
"useCypressPropertiesFile" : true
}
3 changes: 2 additions & 1 deletion repository/Parasol-GemStone.package/Array.extension/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
{
"name" : "Array" }
"name" : "Array"
}
3 changes: 0 additions & 3 deletions repository/Parasol-GemStone.package/BPGemStonePlatform.class/instance/jsonRead..st
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions repository/Parasol-GemStone.package/BPGemStonePlatform.class/instance/jsonWrite..st
View file
Open in desktop

This file was deleted.

19 changes: 8 additions & 11 deletions repository/Parasol-GemStone.package/BPGemStonePlatform.class/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
{
"category" : "Parasol-GemStone",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "",
"instvars" : [
],
"name" : "BPGemStonePlatform",
"pools" : [
],
"super" : "BPSmalltalkPlatform",
"type" : "normal" }
"category" : "Parasol-GemStone",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "BPGemStonePlatform",
"type" : "normal"
}
3 changes: 2 additions & 1 deletion repository/Parasol-GemStone.package/ByteArray.extension/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
{
"name" : "ByteArray" }
"name" : "ByteArray"
}
3 changes: 2 additions & 1 deletion repository/Parasol-GemStone.package/CharacterCollection.extension/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
{
"name" : "CharacterCollection" }
"name" : "CharacterCollection"
}
3 changes: 2 additions & 1 deletion repository/Parasol-GemStone.package/Collection.extension/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
{
"name" : "Collection" }
"name" : "Collection"
}
2 changes: 1 addition & 1 deletion repository/Parasol-GemStone.package/monticello.meta/categories.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SystemOrganization addCategory: #'Parasol-GemStone'!
self packageOrganizer ensurePackage: #'Parasol-GemStone' withTags: #()!
3 changes: 1 addition & 2 deletions repository/Parasol-GemStone.package/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
{
}
{ }
4 changes: 0 additions & 4 deletions repository/Parasol-Pharo9.package/BPPharoPlatform.class/instance/jsonRead..st
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions repository/Parasol-Pharo9.package/BPPharoPlatform.class/instance/jsonWrite..st
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion repository/Parasol-Pharo9.package/monticello.meta/categories.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SystemOrganization addCategory: #'Parasol-Pharo9'!
self packageOrganizer ensurePackage: #'Parasol-Pharo9' withTags: #()!
5 changes: 3 additions & 2 deletions repository/Parasol-Squeak.package/.filetree
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"noMethodMetaData" : true,
"separateMethodMetaAndSource" : false,
"useCypressPropertiesFile" : true }
"noMethodMetaData" : true,
"useCypressPropertiesFile" : true
}
3 changes: 0 additions & 3 deletions repository/Parasol-Squeak.package/BPSqueakPlatform.class/instance/jsonRead..st
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions repository/Parasol-Squeak.package/BPSqueakPlatform.class/instance/jsonWrite..st
View file
Open in desktop

This file was deleted.

19 changes: 8 additions & 11 deletions repository/Parasol-Squeak.package/BPSqueakPlatform.class/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
{
"category" : "Parasol-Squeak",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "",
"instvars" : [
],
"name" : "BPSqueakPlatform",
"pools" : [
],
"super" : "BPSmalltalkPlatform",
"type" : "normal" }
"category" : "Parasol-Squeak",
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [ ],
"instvars" : [ ],
"name" : "BPSqueakPlatform",
"type" : "normal"
}
2 changes: 1 addition & 1 deletion repository/Parasol-Squeak.package/monticello.meta/categories.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SystemOrganization addCategory: #'Parasol-Squeak'!
self packageOrganizer ensurePackage: #'Parasol-Squeak' withTags: #()!
3 changes: 1 addition & 2 deletions repository/Parasol-Squeak.package/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
{
}
{ }
Loading