Skip to content

remove Collections-Abstract-Traits (TSortable) #16533

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

Closed
wants to merge 4 commits into from
Closed

remove Collections-Abstract-Traits (TSortable) #16533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73b9338
remove Collections-Abstract-Traits (TSortable)
pavel-krivanek Apr 27, 2024
6c2a5f6
remove Collections-Abstract-Traits from the bootstrap script
pavel-krivanek Apr 27, 2024
4fc7b0b
clean forgotten TSortable uses and Collections-Abstract-Traits packag…
pavel-krivanek Apr 27, 2024
3833066
Merge branch 'Pharo13' into 16357-TSortable-is-not-used
pavel-krivanek May 13, 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
2 changes: 1 addition & 1 deletion bootstrap/scripts/4-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ echo $(date -u) "[Compiler] Installing Traits through Hermes"

${VM} "${COMPILER_IMAGE_NAME}.image" "${IMAGE_FLAGS}" save ${TRAITS_IMAGE_NAME}
${VM} "${TRAITS_IMAGE_NAME}.image" "${IMAGE_FLAGS}" loadHermes Traits.hermes --save
${VM} "${TRAITS_IMAGE_NAME}.image" "${IMAGE_FLAGS}" loadHermes Kernel-Traits.hermes Collections-Abstract-Traits.hermes CodeImport-Traits.hermes --save
${VM} "${TRAITS_IMAGE_NAME}.image" "${IMAGE_FLAGS}" loadHermes Kernel-Traits.hermes CodeImport-Traits.hermes --save
zip "${TRAITS_IMAGE_NAME}.zip" "${TRAITS_IMAGE_NAME}.image"

#Bootstrap Initialization: Class and Package initialization
Expand Down
3 changes: 1 addition & 2 deletions src/BaselineOfTraits/BaselineOfTraits.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,12 @@ BaselineOfTraits >> baseline: spec [
spec
package: 'Traits';
package: 'Kernel-Traits' with: [ spec requires: #( 'Traits' ) ];
package: 'Collections-Abstract-Traits' with: [ spec requires: #( 'Traits' ) ];
package: 'CodeImport-Traits' with: [ spec requires: #( 'Traits' ) ];
package: 'Traits-Tests' with: [ spec requires: #( 'Traits' ) ].

spec group: 'core' with: #( 'Traits' ).

spec group: 'core-traits' with: #( 'Kernel-Traits' 'Collections-Abstract-Traits' 'CodeImport-Traits' ).
spec group: 'core-traits' with: #( 'Kernel-Traits' 'CodeImport-Traits' ).

spec group: 'default' with: #( 'core-traits' ).
spec group: 'traits-tests' with: #( 'default' 'Traits-Tests' ) ]
Expand Down
15 changes: 0 additions & 15 deletions src/Collections-Abstract-Traits/ManifestCollectionsAbstractTraits.class.st
View file
Open in desktop

This file was deleted.

147 changes: 0 additions & 147 deletions src/Collections-Abstract-Traits/TSortable.trait.st
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/Collections-Abstract-Traits/package.st
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions src/Ring-Definitions-Monticello-Tests/RGTraitDefinitionTest.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ Extension { #name : 'RGTraitDefinitionTest' }
RGTraitDefinitionTest >> testAsFullTraitDefinition [

| rgClass |
rgClass := TSortable asRingDefinition.
rgClass := TAssertable asRingDefinition.
self assertEmpty: rgClass methods.
self assert: rgClass superclass isNil.
self assertEmpty: rgClass subclasses.
self assert: rgClass package name equals: #'Collections-Abstract-Traits'.
self assert: rgClass package name equals: #'SUnit-Core-Traits'.

rgClass := TSortable asFullRingDefinition.
rgClass := TAssertable asFullRingDefinition.
self denyEmpty: rgClass methods.
self assert: (rgClass methodNamed: #isSorted) package isNotNil.
self assert: (rgClass methodNamed: #assert:equals:) package isNotNil.
self assert: rgClass superclass isNotNil.
self assert: rgClass superclass name equals: #Trait.
self assertEmpty: rgClass subclasses.
self assert: rgClass package isNotNil.
self assert: rgClass package equals: rgClass instanceSide package.
self assert: rgClass package name equals: #'Collections-Abstract-Traits'.
self assert: rgClass packageTag equals: #Base.
self assert: rgClass package name equals: #'SUnit-Core-Traits'.
self assert: rgClass packageTag equals: #Uncategorized.

self assert: rgClass superclass superclass isNil.
self assert: rgClass superclass package name equals: #Traits.
Expand Down