Skip to content

Commit a71d800

Browse files
labordeplabordep
authored
Merge pull request #212 from OpenSmock/dev-p13
Working on P13, several issues and dynamic contract update enhancements
2 parents 29c2a93 + 9409708 commit a71d800

10 files changed

+624
-176
lines changed

‎README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ Find below some Molecule branches for old Pharo versions.
7777

7878
Molecule Core has no dependencies.
7979

80-
Package 'Molecule-Benchmarks' requires SMark (https://github.com/smarr/SMark), this package contains benchmarks for working on performances.
80+
**Optional:** The package `Molecule-Benchmarks` requires [SMark](https://github.com/smarr/SMark). This package contains benchmarks for performance-related work.
81+
82+
**Pharo 11 compatibility:** On Pharo 11, [PharoBackwardCompatibility](https://github.com/jecisc/PharoBackwardCompatibility) is automatically loaded via the baseline to ensure compatibility.
8183

8284
## <img src="/resources/puce.svg" width="32" height="32" align="bottom"> Molecule developer menus
8385

‎src/BaselineOfMolecule/BaselineOfMolecule.class.st

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,15 @@ BaselineOfMolecule >> baseline: spec [
2424
package: 'Molecule-Examples' with: [ spec requires: #('Molecule') ];
2525
package: 'Molecule-Tests' with: [ spec requires: #('Molecule') ];
2626
package: 'Molecule-IDE-Tests' with: [ spec requires: #('Molecule-IDE') ].
27+
28+
"Pharo backward compatibility: to preserve running from Pharo 11"
29+
spec
30+
for: #'pharo11.x'
31+
do:[
32+
spec
33+
baseline: 'PharoBackwardCompatibility'
34+
with: [ spec repository: 'github://jecisc/PharoBackwardCompatibility:v1.11.0/src' ]
35+
].
2736
]
2837
]
2938

@@ -32,9 +41,12 @@ BaselineOfMolecule >> postload: loader package: packageSpec [
3241
"Reload new Molecule tools"
3342

3443
(Smalltalk globals includesKey: #MolComponentManager) ifFalse:[ ^self ].
44+
3545
(Smalltalk globals classNamed: #MolComponentManager) cleanUp.
46+
3647
"Rebuild all components"
3748
MolComponentFactory defineAllComponents.
49+
3850
"Reactive dynamic contract update if necessary"
3951
(previousDynamicContractUpdateActivated ifNil:[false]) ifFalse:[
4052
MolComponentFactory default activateDynamicContractUpdate.
@@ -46,7 +58,9 @@ BaselineOfMolecule >> preload: loader package: packageSpec [
4658
"If a Molecule component system is running, confirm loading and cleanUp before installation of the new version"
4759

4860
(Smalltalk globals includesKey: #MolComponentManager) ifFalse:[ ^self ].
61+
4962
previousDynamicContractUpdateActivated := false.
63+
5064
(Smalltalk globals classNamed: #MolComponentManager) isRunningComponents ifTrue:[
5165
(Smalltalk ui theme
5266
proceedIn: Morph new

‎src/Molecule-Tests/MolCompleteComponentOverloadImpl.class.st

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,48 +11,62 @@ Class {
1111

1212
{ #category : #'accessing - events' }
1313
MolCompleteComponentOverloadImpl class >> consumedComponentEvents [
14+
"Warning: dont edit this method, it is generated in MolComponentFactoryTest>>restoreRemovedThings"
1415

1516
<componentContract>
16-
^ { MolUsedEvents. MolUsedEvents2 }
17+
^ {
18+
MolUsedEvents.
19+
MolUsedEvents2 }
1720
]
1821

1922
{ #category : #'accessing - events' }
2023
MolCompleteComponentOverloadImpl class >> producedComponentEvents [
24+
"Warning: dont edit this method, it is generated in MolComponentFactoryTest>>restoreRemovedThings"
2125

22-
<componentContract>
26+
<componentContract>
2327
^ {
2428
MolUsedEvents.
2529
MolUsedEvents2 }
2630
]
2731

2832
{ #category : #'accessing - parameters' }
2933
MolCompleteComponentOverloadImpl class >> providedComponentParameters [
34+
"Warning: dont edit this method, it is generated in MolComponentFactoryTest>>restoreRemovedThings"
3035

3136
<componentContract>
32-
^ { MolUsedParameters. MolUsedParameters2. }
37+
^ {
38+
MolUsedParameters.
39+
MolUsedParameters2 }
3340
]
3441

3542
{ #category : #'accessing - services' }
3643
MolCompleteComponentOverloadImpl class >> providedComponentServices [
44+
"Warning: dont edit this method, it is generated in MolComponentFactoryTest>>restoreRemovedThings"
3745

3846
<componentContract>
39-
^ {
47+
^ {
4048
MolUsedServices.
4149
MolUsedServices2 }
4250
]
4351

4452
{ #category : #'accessing - parameters' }
4553
MolCompleteComponentOverloadImpl class >> usedComponentParameters [
54+
"Warning: dont edit this method, it is generated in MolComponentFactoryTest>>restoreRemovedThings"
4655

4756
<componentContract>
48-
^ { MolUsedParameters. MolUsedParameters2 }
57+
^ {
58+
MolUsedParameters.
59+
MolUsedParameters2 }
4960
]
5061

5162
{ #category : #'accessing - services' }
5263
MolCompleteComponentOverloadImpl class >> usedComponentServices [
64+
"Warning: dont edit this method, it is generated in MolComponentFactoryTest>>restoreRemovedThings"
5365

5466
<componentContract>
55-
^ { MolUsedServices. MolUsedServices2 }
67+
^ {
68+
MolUsedServices.
69+
MolUsedServices2 }
5670
]
5771

5872
{ #category : #events }

‎src/Molecule-Tests/MolCompleteSubComponentOverloadImpl.class.st

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Class {
2+
#name : #MolCompleteSubComponentOverloadImpl,
3+
#superclass : #MolCompleteComponentOverloadImpl,
4+
#category : #'Molecule-Tests-Resources - Components'
5+
}

0 commit comments

Comments
 (0)