labordep · labordep · Nov 9, 2025 · Nov 9, 2025 · Nov 9, 2025 · Nov 9, 2025
diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
@@ -8,22 +8,25 @@ on:
     branches:
       - 'main'
   pull_request:
-    types: [assigned, opened, synchronize, reopened]
+    types: [opened, synchronize, reopened]
 
 jobs:
   build:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        smalltalk: [ Pharo64-11, Pharo64-12 ]
+        smalltalk: [ Pharo64-11, Pharo64-12, Pharo64-13 ]
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: hpi-swa/setup-smalltalkCI@v1
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Setup smalltalkCI
+        uses: hpi-swa/setup-smalltalkCI@v1
         with:
           smalltalk-image: ${{ matrix.smalltalk }}
-      - name: Load in New Image and Run Tests
+      - name: Load in new image and run tests
         run: smalltalkci -s ${{ matrix.smalltalk }} ${{ matrix.ston }}
         shell: bash
-        timeout-minutes: 15
+        timeout-minutes: 30
diff --git a/.project b/.project
@@ -1,3 +1,4 @@
 {
-	'srcDirectory' : ''
+	'srcDirectory' : 'src',
+	'tags' : [ #Laborde]
 }
diff --git a/.smalltalk.ston b/.smalltalk.ston
@@ -2,12 +2,14 @@ SmalltalkCISpec {
   #loading : [
     SCIMetacelloLoadSpec {
       #baseline : 'Collectable',
+      #directory : 'src',
+      #onConflict : #useLoaded,
+      #onUpgrade : #useLoaded,
+      #onWarningLog : true,
       #platforms : [ #pharo ]
     }
   ],
   #testing : {
-    #include : {
-      #packages : [ 'Collectable*-Tests' ]
-    }
+    #packages : [ 'Collectable*-Tests' ]
   }
 }
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Pierre Laborde
+Copyright (c) 2023-2025 Pierre Laborde
 
 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
@@ -13,18 +13,17 @@
 ```smalltalk
 Metacello new 
 	repository: 'github://labordep/Collectable:main';
-	baseline: 'Collectable' ;
+	baseline: 'Collectable';
+	onConflictUseLoaded;
 	load.
 ```
 
 ## Dependencies
 
-- [Toplo](https://github.com/plantec/Toplo)
-- [Bloc](https://github.com/pharo-graphics/Bloc)
-- [Pyramid](https://github.com/OpenSmock/Pyramid)
 - [Molecule](https://github.com/OpenSmock/Molecule)
+- [Pyramid](https://github.com/OpenSmock/Pyramid)
 - [PharoGameye](https://github.com/labordep/PharoGameye)
-- [OS-Windows](https://github.com/astares/Pharo-OS-Windows/src)
+- [OS-Windows](https://github.com/OpenSmock/OS-Windows)
 
 ## License
 

diff --git a/.properties → src/.properties b/.properties → src/.properties
diff --git a/...ollectable/BaselineOfCollectable.class.st → ...ollectable/BaselineOfCollectable.class.st b/...ollectable/BaselineOfCollectable.class.st → ...ollectable/BaselineOfCollectable.class.st
@@ -30,23 +30,17 @@ BaselineOfCollectable >> baseline: spec [
 { #category : #baselines }
 BaselineOfCollectable >> dependencies: spec [
 
-	"Roassal stable version"
-	spec baseline: 'Roassal' with: [ spec repository: 'github://pharo-graphics/Roassal' ].
-
 	"Functionnality to import Pharo Gameye datas"
-	spec baseline: 'Gameye' with: [ spec repository: 'github://labordep/PharoGameye:2.0.1' ].
+	spec baseline: 'Gameye' with: [ spec repository: 'github://labordep/PharoGameye:2.0.3' ].
 
 	"OS-Windows management layer for the UI"
 	Smalltalk os isWindows ifTrue: [
-		spec baseline: 'OSWindows' with: [ spec repository: 'github://astares/Pharo-OS-Windows/src' ].
-
-		"OpenSmock OS-Windows extensions"
 		spec baseline: 'OSWindowsOpenSmock' with: [ spec repository: 'github://OpenSmock/OS-Windows:main' ].		
 	].	
 
-	"UI tool : Pyramid - Pyramid already load Toplo (and Bloc of course)"
-	spec baseline: 'Pyramid' with: [ spec repository: 'github://OpenSmock/Pyramid:main/src' ].
+	"UI editor: Pyramid"
+	spec baseline: 'Pyramid' with: [ spec repository: 'github://OpenSmock/Pyramid:main' ].
 
-	"Architecture framework : Molecule"
-	spec baseline: 'Molecule' with: [ spec repository: 'github://OpenSmock/Molecule:1.2.12' ].
+	"Component architecture framework: Molecule"
+	spec baseline: 'Molecule' with: [ spec repository: 'github://OpenSmock/Molecule:1.3.4' ].
 ]
diff --git a/BaselineOfCollectable/package.st → src/BaselineOfCollectable/package.st b/BaselineOfCollectable/package.st → src/BaselineOfCollectable/package.st
diff --git a/...table-Gameye-IDE/CollecWorld.extension.st → ...table-Gameye-IDE/CollecWorld.extension.st b/...table-Gameye-IDE/CollecWorld.extension.st → ...table-Gameye-IDE/CollecWorld.extension.st
diff --git a/Collectable-Gameye-IDE/package.st → src/Collectable-Gameye-IDE/package.st b/Collectable-Gameye-IDE/package.st → src/Collectable-Gameye-IDE/package.st
diff --git a/...meye-Tests/CollecGameyeUtilsTest.class.st → ...meye-Tests/CollecGameyeUtilsTest.class.st b/...meye-Tests/CollecGameyeUtilsTest.class.st → ...meye-Tests/CollecGameyeUtilsTest.class.st
diff --git a/...ye-Tests/GameyeVideoGameTest.extension.st → ...ye-Tests/GameyeVideoGameTest.extension.st b/...ye-Tests/GameyeVideoGameTest.extension.st → ...ye-Tests/GameyeVideoGameTest.extension.st
diff --git a/Collectable-Gameye-Tests/package.st → src/Collectable-Gameye-Tests/package.st b/Collectable-Gameye-Tests/package.st → src/Collectable-Gameye-Tests/package.st
diff --git a/...ectable-Gameye/CollecGameyeUtils.class.st → ...ectable-Gameye/CollecGameyeUtils.class.st b/...ectable-Gameye/CollecGameyeUtils.class.st → ...ectable-Gameye/CollecGameyeUtils.class.st
diff --git a/...CollectableVideoGamePlatform.extension.st → ...CollectableVideoGamePlatform.extension.st b/...CollectableVideoGamePlatform.extension.st → ...CollectableVideoGamePlatform.extension.st
diff --git a/...meye/CollectibleGameyePeripheral.class.st → ...meye/CollectibleGameyePeripheral.class.st b/...meye/CollectibleGameyePeripheral.class.st → ...meye/CollectibleGameyePeripheral.class.st
diff --git a/...e-Gameye/CollectibleGameyeSystem.class.st → ...e-Gameye/CollectibleGameyeSystem.class.st b/...e-Gameye/CollectibleGameyeSystem.class.st → ...e-Gameye/CollectibleGameyeSystem.class.st
diff --git a/...ameye/CollectibleGameyeVideoGame.class.st → ...ameye/CollectibleGameyeVideoGame.class.st b/...ameye/CollectibleGameyeVideoGame.class.st → ...ameye/CollectibleGameyeVideoGame.class.st
diff --git a/...able-Gameye/GameyePeripheral.extension.st → ...able-Gameye/GameyePeripheral.extension.st b/...able-Gameye/GameyePeripheral.extension.st → ...able-Gameye/GameyePeripheral.extension.st
diff --git a/Collectable-Gameye/GameyeSystem.extension.st → ...lectable-Gameye/GameyeSystem.extension.st b/Collectable-Gameye/GameyeSystem.extension.st → ...lectable-Gameye/GameyeSystem.extension.st
diff --git a/...table-Gameye/GameyeVideoGame.extension.st → ...table-Gameye/GameyeVideoGame.extension.st b/...table-Gameye/GameyeVideoGame.extension.st → ...table-Gameye/GameyeVideoGame.extension.st
diff --git a/...ye/TCollectibleGameyeCollectible.trait.st → ...ye/TCollectibleGameyeCollectible.trait.st b/...ye/TCollectibleGameyeCollectible.trait.st → ...ye/TCollectibleGameyeCollectible.trait.st
diff --git a/...eye/TCollectibleGameyePeripheral.trait.st → ...eye/TCollectibleGameyePeripheral.trait.st b/...eye/TCollectibleGameyePeripheral.trait.st → ...eye/TCollectibleGameyePeripheral.trait.st
diff --git a/...-Gameye/TCollectibleGameyeSystem.trait.st → ...-Gameye/TCollectibleGameyeSystem.trait.st b/...-Gameye/TCollectibleGameyeSystem.trait.st → ...-Gameye/TCollectibleGameyeSystem.trait.st
diff --git a/...meye/TCollectibleGameyeVideoGame.trait.st → ...meye/TCollectibleGameyeVideoGame.trait.st b/...meye/TCollectibleGameyeVideoGame.trait.st → ...meye/TCollectibleGameyeVideoGame.trait.st
diff --git a/Collectable-Gameye/package.st → src/Collectable-Gameye/package.st b/Collectable-Gameye/package.st → src/Collectable-Gameye/package.st
diff --git a/Collectable-IDE/CollecWorld.class.st → src/Collectable-IDE/CollecWorld.class.st b/Collectable-IDE/CollecWorld.class.st → src/Collectable-IDE/CollecWorld.class.st
diff --git a/Collectable-IDE/package.st → src/Collectable-IDE/package.st b/Collectable-IDE/package.st → src/Collectable-IDE/package.st
diff --git a/Collectable-Incubator/package.st → src/Collectable-Incubator/package.st b/Collectable-Incubator/package.st → src/Collectable-Incubator/package.st
diff --git a/...-Tests/CollectibleCollectionTest.class.st → ...-Tests/CollectibleCollectionTest.class.st b/...-Tests/CollectibleCollectionTest.class.st → ...-Tests/CollectibleCollectionTest.class.st
diff --git a/Collectable-Tests/CollectibleTest.class.st → ...ollectable-Tests/CollectibleTest.class.st b/Collectable-Tests/CollectibleTest.class.st → ...ollectable-Tests/CollectibleTest.class.st
diff --git a/Collectable-Tests/package.st → src/Collectable-Tests/package.st b/Collectable-Tests/package.st → src/Collectable-Tests/package.st
diff --git a/...llectibleVideoGamePeripheralTest.class.st → ...llectibleVideoGamePeripheralTest.class.st b/...llectibleVideoGamePeripheralTest.class.st → ...llectibleVideoGamePeripheralTest.class.st
diff --git a/...s/CollectibleVideoGameSystemTest.class.st → ...s/CollectibleVideoGameSystemTest.class.st b/...s/CollectibleVideoGameSystemTest.class.st → ...s/CollectibleVideoGameSystemTest.class.st
diff --git a/...s-Tests/CollectibleVideoGameTest.class.st → ...s-Tests/CollectibleVideoGameTest.class.st b/...s-Tests/CollectibleVideoGameTest.class.st → ...s-Tests/CollectibleVideoGameTest.class.st
diff --git a/Collectable-VideoGames-Tests/package.st → src/Collectable-VideoGames-Tests/package.st b/Collectable-VideoGames-Tests/package.st → src/Collectable-VideoGames-Tests/package.st
diff --git a/...ames/CollectableVideoGameFullset.class.st → ...ames/CollectableVideoGameFullset.class.st b/...ames/CollectableVideoGameFullset.class.st → ...ames/CollectableVideoGameFullset.class.st
diff --git a/...lectableVideoGameFullsetStatView.class.st → ...lectableVideoGameFullsetStatView.class.st b/...lectableVideoGameFullsetStatView.class.st → ...lectableVideoGameFullsetStatView.class.st
diff --git a/...mes/CollectableVideoGamePlatform.class.st → ...mes/CollectableVideoGamePlatform.class.st b/...mes/CollectableVideoGamePlatform.class.st → ...mes/CollectableVideoGamePlatform.class.st
diff --git a/...es/CollectableVideoGamesCatalogs.class.st → ...es/CollectableVideoGamesCatalogs.class.st b/...es/CollectableVideoGamesCatalogs.class.st → ...es/CollectableVideoGamesCatalogs.class.st
diff --git a/...mes/CollectableVideoGamesUIUtils.class.st → ...mes/CollectableVideoGamesUIUtils.class.st b/...mes/CollectableVideoGamesUIUtils.class.st → ...mes/CollectableVideoGamesUIUtils.class.st
diff --git a/...-VideoGames/CollectibleVideoGame.class.st → ...-VideoGames/CollectibleVideoGame.class.st b/...-VideoGames/CollectibleVideoGame.class.st → ...-VideoGames/CollectibleVideoGame.class.st
diff --git a/...s/CollectibleVideoGameCompletion.class.st → ...s/CollectibleVideoGameCompletion.class.st b/...s/CollectibleVideoGameCompletion.class.st → ...s/CollectibleVideoGameCompletion.class.st
diff --git a/...s/CollectibleVideoGamePeripheral.class.st → ...s/CollectibleVideoGamePeripheral.class.st b/...s/CollectibleVideoGamePeripheral.class.st → ...s/CollectibleVideoGamePeripheral.class.st
diff --git a/...Games/CollectibleVideoGameSystem.class.st → ...Games/CollectibleVideoGameSystem.class.st b/...Games/CollectibleVideoGameSystem.class.st → ...Games/CollectibleVideoGameSystem.class.st
diff --git a/Collectable-VideoGames/package.st → src/Collectable-VideoGames/package.st b/Collectable-VideoGames/package.st → src/Collectable-VideoGames/package.st
diff --git a/...table/CollecOSProjectManagerType.trait.st → ...table/CollecOSProjectManagerType.trait.st b/...table/CollecOSProjectManagerType.trait.st → ...table/CollecOSProjectManagerType.trait.st
diff --git a/Collectable/CollectOSPharoManager.class.st → ...ollectable/CollectOSPharoManager.class.st b/Collectable/CollectOSPharoManager.class.st → ...ollectable/CollectOSPharoManager.class.st
diff --git a/.../CollectOSProjectManagerServices.trait.st → .../CollectOSProjectManagerServices.trait.st b/.../CollectOSProjectManagerServices.trait.st → .../CollectOSProjectManagerServices.trait.st
diff --git a/Collectable/CollectOSWindowsManager.class.st → ...lectable/CollectOSWindowsManager.class.st b/Collectable/CollectOSWindowsManager.class.st → ...lectable/CollectOSWindowsManager.class.st
diff --git a/Collectable/Collectable.class.st → src/Collectable/Collectable.class.st b/Collectable/Collectable.class.st → src/Collectable/Collectable.class.st
diff --git a/Collectable/CollectableApp.trait.st → src/Collectable/CollectableApp.trait.st b/Collectable/CollectableApp.trait.st → src/Collectable/CollectableApp.trait.st
diff --git a/Collectable/CollectableAppImpl.class.st → src/Collectable/CollectableAppImpl.class.st b/Collectable/CollectableAppImpl.class.st → src/Collectable/CollectableAppImpl.class.st
diff --git a/...le/CollectableCollectionsManager.trait.st → ...le/CollectableCollectionsManager.trait.st b/...le/CollectableCollectionsManager.trait.st → ...le/CollectableCollectionsManager.trait.st
diff --git a/...lectableCollectionsManagerEvents.trait.st → ...lectableCollectionsManagerEvents.trait.st b/...lectableCollectionsManagerEvents.trait.st → ...lectableCollectionsManagerEvents.trait.st
diff --git a/...ollectableCollectionsManagerImpl.class.st → ...ollectableCollectionsManagerImpl.class.st b/...ollectableCollectionsManagerImpl.class.st → ...ollectableCollectionsManagerImpl.class.st
diff --git a/...ctableCollectionsManagerServices.trait.st → ...ctableCollectionsManagerServices.trait.st b/...ctableCollectionsManagerServices.trait.st → ...ctableCollectionsManagerServices.trait.st
diff --git a/Collectable/CollectableFullset.class.st → src/Collectable/CollectableFullset.class.st b/Collectable/CollectableFullset.class.st → src/Collectable/CollectableFullset.class.st
diff --git a/Collectable/CollectablePlatform.class.st → src/Collectable/CollectablePlatform.class.st b/Collectable/CollectablePlatform.class.st → src/Collectable/CollectablePlatform.class.st
diff --git a/...ctable/CollectablePricesStatView.class.st → ...ctable/CollectablePricesStatView.class.st b/...ctable/CollectablePricesStatView.class.st → ...ctable/CollectablePricesStatView.class.st
diff --git a/Collectable/CollectableTVRegion.class.st → src/Collectable/CollectableTVRegion.class.st b/Collectable/CollectableTVRegion.class.st → src/Collectable/CollectableTVRegion.class.st
diff --git a/Collectable/CollectableUserdatas.class.st → ...Collectable/CollectableUserdatas.class.st b/Collectable/CollectableUserdatas.class.st → ...Collectable/CollectableUserdatas.class.st
diff --git a/Collectable/CollectableView.trait.st → src/Collectable/CollectableView.trait.st b/Collectable/CollectableView.trait.st → src/Collectable/CollectableView.trait.st
diff --git a/Collectable/CollectableViewEvents.trait.st → ...ollectable/CollectableViewEvents.trait.st b/Collectable/CollectableViewEvents.trait.st → ...ollectable/CollectableViewEvents.trait.st
diff --git a/Collectable/CollectableViewServices.trait.st → ...lectable/CollectableViewServices.trait.st b/Collectable/CollectableViewServices.trait.st → ...lectable/CollectableViewServices.trait.st
diff --git a/Collectable/Collectible.class.st → src/Collectable/Collectible.class.st b/Collectable/Collectible.class.st → src/Collectable/Collectible.class.st
diff --git a/Collectable/CollectibleCatalog.class.st → src/Collectable/CollectibleCatalog.class.st b/Collectable/CollectibleCatalog.class.st → src/Collectable/CollectibleCatalog.class.st
diff --git a/Collectable/CollectibleCollection.class.st → ...ollectable/CollectibleCollection.class.st b/Collectable/CollectibleCollection.class.st → ...ollectable/CollectibleCollection.class.st
diff --git a/Collectable/CollectibleCompletion.class.st → ...ollectable/CollectibleCompletion.class.st b/Collectable/CollectibleCompletion.class.st → ...ollectable/CollectibleCompletion.class.st
diff --git a/Collectable/MolUtils.extension.st → src/Collectable/MolUtils.extension.st b/Collectable/MolUtils.extension.st → src/Collectable/MolUtils.extension.st
diff --git a/Collectable/TCollectible.trait.st → src/Collectable/TCollectible.trait.st b/Collectable/TCollectible.trait.st → src/Collectable/TCollectible.trait.st
diff --git a/...table/TCollectibleBelongPlatform.trait.st → ...table/TCollectibleBelongPlatform.trait.st b/...table/TCollectibleBelongPlatform.trait.st → ...table/TCollectibleBelongPlatform.trait.st
diff --git a/Collectable/TCollectibleCollection.trait.st → ...llectable/TCollectibleCollection.trait.st b/Collectable/TCollectibleCollection.trait.st → ...llectable/TCollectibleCollection.trait.st
diff --git a/Collectable/TCollectibleCompletion.trait.st → ...llectable/TCollectibleCompletion.trait.st b/Collectable/TCollectibleCompletion.trait.st → ...llectable/TCollectibleCompletion.trait.st
diff --git a/...le/TCollectibleCompletionHaveBox.trait.st → ...le/TCollectibleCompletionHaveBox.trait.st b/...le/TCollectibleCompletionHaveBox.trait.st → ...le/TCollectibleCompletionHaveBox.trait.st
diff --git a/...TCollectibleCompletionHaveManual.trait.st → ...TCollectibleCompletionHaveManual.trait.st b/...TCollectibleCompletionHaveManual.trait.st → ...TCollectibleCompletionHaveManual.trait.st
diff --git a/...CollectibleCompletionHaveSupport.trait.st → ...CollectibleCompletionHaveSupport.trait.st b/...CollectibleCompletionHaveSupport.trait.st → ...CollectibleCompletionHaveSupport.trait.st
diff --git a/Collectable/TCollectibleDelegator.trait.st → ...ollectable/TCollectibleDelegator.trait.st b/Collectable/TCollectibleDelegator.trait.st → ...ollectable/TCollectibleDelegator.trait.st
diff --git a/...table/TCollectibleHaveCompletion.trait.st → ...table/TCollectibleHaveCompletion.trait.st b/...table/TCollectibleHaveCompletion.trait.st → ...table/TCollectibleHaveCompletion.trait.st
diff --git a/Collectable/TCollectibleHaveCountry.trait.st → ...lectable/TCollectibleHaveCountry.trait.st b/Collectable/TCollectibleHaveCountry.trait.st → ...lectable/TCollectibleHaveCountry.trait.st
diff --git a/...ctable/TCollectibleHaveDeveloper.trait.st → ...ctable/TCollectibleHaveDeveloper.trait.st b/...ctable/TCollectibleHaveDeveloper.trait.st → ...ctable/TCollectibleHaveDeveloper.trait.st
diff --git a/...ctable/TCollectibleHavePublisher.trait.st → ...ctable/TCollectibleHavePublisher.trait.st b/...ctable/TCollectibleHavePublisher.trait.st → ...ctable/TCollectibleHavePublisher.trait.st
diff --git a/...ectable/TCollectibleHaveTVRegion.trait.st → ...ectable/TCollectibleHaveTVRegion.trait.st b/...ectable/TCollectibleHaveTVRegion.trait.st → ...ectable/TCollectibleHaveTVRegion.trait.st
diff --git a/Collectable/package.st → src/Collectable/package.st b/Collectable/package.st → src/Collectable/package.st