From 53df36a0a7fa74ef31bf4a1336e8cab09f56b154 Mon Sep 17 00:00:00 2001 From: Pierre Laborde Date: Fri, 13 Feb 2026 11:27:44 +0100 Subject: [PATCH 1/2] Update Bloc repository (and add Album) in the baseline --- .smalltalkci.default.ston | 10 +++++++++- LICENSE | 2 +- README.md | 5 +++-- .../BaselineOfToploSerialization.class.st | 7 ++++--- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.smalltalkci.default.ston b/.smalltalkci.default.ston index c77b696..c80d4dc 100644 --- a/.smalltalkci.default.ston +++ b/.smalltalkci.default.ston @@ -5,6 +5,14 @@ SmalltalkCISpec { #directory : 'src', #onConflict : #useLoaded, #platforms : [ #pharo ] + #onConflict : #useIncoming, + #onUpgrade : #useLoaded, + #ignoreImage : true } - ] + ], + + #testing : { + #failOnZeroTests : false, + #packages : [ 'Toplo-Serialization.*.Tests' ] + } } diff --git a/LICENSE b/LICENSE index f630b4b..dc050e4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 OpenSmock +Copyright (c) 2023-2026 OpenSmock Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 1f6e2fc..e2421e8 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,10 @@ Metacello new ## Dependencies -- [Toplo](https://github.com/plantec/Toplo) - [Bloc-Serialization](https://github.dev/OpenSmock/Bloc-Serialization) +- [Album](https://github.com/pharo-graphics/Album) +- [Toplo](https://github.com/pharo-graphics/Toplo) ## License -This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details. +This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details. \ No newline at end of file diff --git a/src/BaselineOfToploSerialization/BaselineOfToploSerialization.class.st b/src/BaselineOfToploSerialization/BaselineOfToploSerialization.class.st index 8b44bf6..a651ff7 100644 --- a/src/BaselineOfToploSerialization/BaselineOfToploSerialization.class.st +++ b/src/BaselineOfToploSerialization/BaselineOfToploSerialization.class.st @@ -33,12 +33,13 @@ BaselineOfToploSerialization >> dependency: spec [ baseline: #BlocSerialization with: [ spec repository: 'github://OpenSmock/Bloc-Serialization:main/src' ]. - + + "Graphic librairies: this section should be removed when librairies will be integrated in Pharo" spec baseline: 'Album' - with: [ spec repository: 'github://OpenSmock/Album:master' ]. + with: [ spec repository: 'github://ThalesGroup/Album:dev' ]. spec baseline: 'Toplo' - with: [ spec repository: 'github://OpenSmock/Toplo:dev/src' ] + with: [ spec repository: 'github://ThalesGroup/Toplo:dev' ] ] From ad735d176ee2d786860e58a02e34bb2f5cf27283 Mon Sep 17 00:00:00 2001 From: Pierre Laborde Date: Fri, 13 Feb 2026 11:36:40 +0100 Subject: [PATCH 2/2] Fix CI --- .smalltalkci.default.ston | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.smalltalkci.default.ston b/.smalltalkci.default.ston index c80d4dc..2405d2c 100644 --- a/.smalltalkci.default.ston +++ b/.smalltalkci.default.ston @@ -4,7 +4,7 @@ SmalltalkCISpec { #baseline : 'ToploSerialization', #directory : 'src', #onConflict : #useLoaded, - #platforms : [ #pharo ] + #platforms : [ #pharo ], #onConflict : #useIncoming, #onUpgrade : #useLoaded, #ignoreImage : true