Merge pull request #16659 from jecisc/deprecated-aliases

Remove deprecated aliases of P12
pharo-project · Jun 3, 2024 · 0ac6afe · 0ac6afe
2 parents 92c5115 + 3596de0
commit 0ac6afe
Show file tree

Hide file tree

Showing 74 changed files with 36 additions and 424 deletions.
diff --git a/bootstrap/scripts/03-metacello-bootstrap/01-loadMetacello.st b/bootstrap/scripts/03-metacello-bootstrap/01-loadMetacello.st
@@ -34,9 +34,6 @@ MCFileTreeFileSystemUtils initialize.
 ConfigurationOf initialize.
 MetacelloPlatform initialize.
 
-"Init deprecated aliases for Pharo 12. To remove in Pharo 13"
-{ MetacelloPlatform . MetacelloProject . MetacelloProjectSpec . MetacelloTarget . MetacelloVersion . MetacelloVersionSpec } do: [ :class | class initialize ].
-
 STONWriter initialize.
 
 MCGitHubRepository initialize.

diff --git a/src/BaselineOfPharo/BaselineOfPharo.class.st b/src/BaselineOfPharo/BaselineOfPharo.class.st
@@ -119,7 +119,7 @@ BaselineOfPharo class >> roassal [
 		  newName: 'Roassal'
 		  owner: 'pharo-graphics'
 		  project: 'Roassal'
-		  version: 'v1.06d'
+		  version: 'v1.06e'
 ]
 
 { #category : 'repository urls' }

diff --git a/src/BeautifulComments/ClyPackageRichTextCommentEditorToolMorph.class.st b/src/BeautifulComments/ClyPackageRichTextCommentEditorToolMorph.class.st
@@ -22,7 +22,7 @@ ClyPackageRichTextCommentEditorToolMorph class >> browserTabActivation [
 	"This declaration specifies that in any browser when packages are selected, a comment editor will be available in a tab."
 
 	<classAnnotation>
-	^ClyTabActivationStrategyAnnotation for: RPackage asCalypsoItemContext
+	^ClyTabActivationStrategyAnnotation for: Package asCalypsoItemContext
 ]
 
 { #category : 'activation' }

diff --git a/src/Calypso-Browser/ClyTabActivationStrategyAnnotation.class.st b/src/Calypso-Browser/ClyTabActivationStrategyAnnotation.class.st
@@ -12,12 +12,6 @@ Class {
 	#tag : 'Tabs'
 }
 
-{ #category : 'class initialization' }
-ClyTabActivationStrategyAnnotation class >> initialize [
-
-	self deprecatedAliases: { #ClyTabActivationStrategy }
-]
-
 { #category : 'operations' }
 ClyTabActivationStrategyAnnotation >> createToolFor: aBrowser inContext: aBrowserContext [
 

diff --git a/src/Calypso-SystemTools-Core/ClyProtocolEditorMorph.class.st b/src/Calypso-SystemTools-Core/ClyProtocolEditorMorph.class.st
@@ -30,11 +30,6 @@ Class {
 	#tag : 'Editors-Methods'
 }
 
-{ #category : 'class initialization' }
-ClyProtocolEditorMorph class >> initialize [
-	self deprecatedAliases: { #ClyProtocolAndPackageEditorMorph }
-]
-
 { #category : 'building' }
 ClyProtocolEditorMorph >> build [
 	self buildResetButton.

diff --git a/src/Kernel-CodeModel-Tests/PackageAndClassesTest.class.st b/src/Kernel-CodeModel-Tests/PackageAndClassesTest.class.st
@@ -426,15 +426,15 @@ PackageAndClassesTest >> testRenameClass [
 
 	| xPackage class |
 	xPackage := self ensureXPackage.
-	class := self newClassNamed: #RPackageOldStubClass in: xPackage.
+	class := self newClassNamed: #PackageOldStubClass in: xPackage.
 
-	class rename: #RPackageNewStubClass.
+	class rename: #PackageNewStubClass.
 
 	self assert: (self organizer packageOf: class) equals: xPackage.
-	self assert: (self organizer packageOfClassNamed: #RPackageNewStubClass) equals: xPackage.
-	self assert: (self organizer packageOfClassNamed: #RPackageOldStubClass) equals: self organizer undefinedPackage.
-	self assert: (xPackage includesClassNamed: 'RPackageNewStubClass').
-	self deny: (xPackage includesClassNamed: 'RPackageOldStubClass')
+	self assert: (self organizer packageOfClassNamed: #PackageNewStubClass) equals: xPackage.
+	self assert: (self organizer packageOfClassNamed: #PackageOldStubClass) equals: self organizer undefinedPackage.
+	self assert: (xPackage includesClassNamed: 'PackageNewStubClass').
+	self deny: (xPackage includesClassNamed: 'PackageOldStubClass')
 ]
 
 { #category : 'tests - operations on classes' }
@@ -443,10 +443,10 @@ PackageAndClassesTest >> testRenameClassUpdateClassDefinedSelectorsInTheParentPa
 
 	| xPackage class |
 	xPackage := self ensureXPackage.
-	class := self newClassNamed: 'RPackageOldStubClass' asSymbol in: xPackage.
-	self createMethodNamed: 'stubMethod' inClass: class inProtocol: 'classic category'.
+	class := self newClassNamed: 'PackageOldStubClass' asSymbol in: xPackage.
+	self createMethodNamed: 'stubMethod' inClass: class inProtocol: 'classic protocol'.
 
-	class rename: 'RPackageNewStubClass'.
+	class rename: 'PackageNewStubClass'.
 
 	self assert: (class >> #stubMethod) package equals: xPackage.
 	self deny: (class >> #stubMethod) isExtension
@@ -459,10 +459,10 @@ PackageAndClassesTest >> testRenameClassUpdateClassExtensionSelectorsInTheExtend
 	| xPackage yPackage class |
 	xPackage := self ensureXPackage.
 	yPackage := self ensureYPackage.
-	class := self newClassNamed: #RPackageOldStubClass in: xPackage.
+	class := self newClassNamed: #PackageOldStubClass in: xPackage.
 	self createMethodNamed: 'stubMethod' inClass: class asExtensionOf: yPackage.
 
-	class rename: 'RPackageNewStubClass'.
+	class rename: 'PackageNewStubClass'.
 
 	self assert: (yPackage includesExtensionSelector: #stubMethod ofClass: class)
 ]
@@ -473,10 +473,10 @@ PackageAndClassesTest >> testRenameClassUpdateMetaclassDefinedSelectorsInThePare
 
 	| xPackage class |
 	xPackage := self ensureXPackage.
-	class := self newClassNamed: #RPackageOldStubClass in: xPackage.
-	self createMethodNamed: 'stubMethod' inClass: class class inProtocol: 'classic category'.
+	class := self newClassNamed: #PackageOldStubClass in: xPackage.
+	self createMethodNamed: 'stubMethod' inClass: class class inProtocol: 'classic protocol'.
 
-	class rename: 'RPackageNewStubClass'.
+	class rename: 'PackageNewStubClass'.
 
 	self assert: (class class >> #stubMethod) package equals: xPackage.
 	self deny: (class class >> #stubMethod) isExtension
@@ -489,10 +489,10 @@ PackageAndClassesTest >> testRenameClassUpdateMetaclassExtensionSelectorsInTheEx
 	| xPackage yPackage class |
 	xPackage := self ensureXPackage.
 	yPackage := self ensureYPackage.
-	class := self newClassNamed: #RPackageOldStubClass in: xPackage.
+	class := self newClassNamed: #PackageOldStubClass in: xPackage.
 	self createMethodNamed: 'stubMethod' inClass: class class asExtensionOf: yPackage.
 
-	class rename: 'RPackageNewStubClass'.
+	class rename: 'PackageNewStubClass'.
 
 	self assert: (yPackage includesExtensionSelector: #stubMethod ofClass: class class)
 ]
@@ -504,10 +504,10 @@ PackageAndClassesTest >> testRenameClassUpdateOrganizerClassExtendingPackagesMap
 	| xPackage yPackage class |
 	xPackage := self ensureXPackage.
 	yPackage := self ensureYPackage.
-	class := self newClassNamed: #RPackageOldStubClass in: xPackage.
+	class := self newClassNamed: #PackageOldStubClass in: xPackage.
 	self createMethodNamed: #stubMethod inClass: class asExtensionOf: yPackage.
 
-	class rename: 'RPackageNewStubClass'.
+	class rename: 'PackageNewStubClass'.
 
 	self assert: (class extendingPackages includes: yPackage)
 ]

diff --git a/src/Kernel-CodeModel-Tests/PackageOrganizerTest.class.st b/src/Kernel-CodeModel-Tests/PackageOrganizerTest.class.st
@@ -112,7 +112,6 @@ PackageOrganizerTest >> testExtensionMethodNotExactlyTheName [
 PackageOrganizerTest >> testFullRegistration [
 
 	| xPackage yPackage zPackage a1 a2 b1 b2 a3 |
-	"taken from setup of RPackageReadOnlyCompleteSetup"
 	xPackage := self ensureXPackage.
 	yPackage := self ensureYPackage.
 	zPackage := self ensureZPackage.
@@ -360,7 +359,6 @@ PackageOrganizerTest >> testRemoveEmptyPackagesAndTags [
 PackageOrganizerTest >> testRemovePackage [
 
 	| xPackage yPackage zPackage a1 a2 b1 b2 a3 |
-	"taken from setup of RPackageReadOnlyCompleteSetup"
 	xPackage := self ensureXPackage.
 	yPackage := self ensureYPackage.
 	zPackage := self ensureZPackage.

diff --git a/src/Kernel-CodeModel-Tests/PackageTest.class.st b/src/Kernel-CodeModel-Tests/PackageTest.class.st
@@ -131,10 +131,10 @@ PackageTest >> testAnonymousClassAndSelector [
 	| ghost method |
 	ghost := Object newAnonymousSubclassInEnvironment: testEnvironment.
 	method := ghost compiler compile: 'rpackagetest'.
-	ghost addSelector: #rpackagetest withMethod: method.
-	self deny: (self organizer undefinedPackage includesSelector: #rpackagetest ofClass: ghost).
+	ghost addSelector: #packagetest withMethod: method.
+	self deny: (self organizer undefinedPackage includesSelector: #packagetest ofClass: ghost).
 	self assert: (self organizer packageOfClassNamed: ghost name) equals: self organizer undefinedPackage.
-	ghost classify: #rpackagetest under: '*rpackagetest'
+	ghost classify: #packagetest under: '*packagetest'
 ]
 
 { #category : 'tests - extensions' }
@@ -154,7 +154,7 @@ PackageTest >> testAsPackageWithError [
 ]
 
 { #category : 'tests - demotion' }
-PackageTest >> testDemoteToRPackageNamed [
+PackageTest >> testDemoteToPackageNamed [
 
 	| package1 package2 class |
 	package1 := self ensurePackage: #'Test1-TAG1'.
@@ -171,7 +171,7 @@ PackageTest >> testDemoteToRPackageNamed [
 ]
 
 { #category : 'tests - demotion' }
-PackageTest >> testDemoteToRPackageNamedExistingPackage [
+PackageTest >> testDemoteToPackageNamedExistingPackage [
 
 	| package1 package2 packageExisting class |
 	package1 := self ensurePackage: #'Test1-TAG1'.
@@ -190,7 +190,7 @@ PackageTest >> testDemoteToRPackageNamedExistingPackage [
 ]
 
 { #category : 'tests - demotion' }
-PackageTest >> testDemoteToRPackageNamedKeepOrganizer [
+PackageTest >> testDemoteToPackageNamedKeepOrganizer [
 
 	| newOrganizer package renamedPackage |
 	newOrganizer := PackageOrganizer new.
@@ -203,7 +203,7 @@ PackageTest >> testDemoteToRPackageNamedKeepOrganizer [
 ]
 
 { #category : 'tests - demotion' }
-PackageTest >> testDemoteToRPackageNamedMultilevelPackage [
+PackageTest >> testDemoteToPackageNamedMultilevelPackage [
 
 	| package1 package2 class |
 	package1 := self ensurePackage: #'Test1-TAG1-X1'.
@@ -220,7 +220,7 @@ PackageTest >> testDemoteToRPackageNamedMultilevelPackage [
 ]
 
 { #category : 'tests - demotion' }
-PackageTest >> testDemoteToRPackageNamedWithExtension [
+PackageTest >> testDemoteToPackageNamedWithExtension [
 
 	| packageOriginal packageDemoted class classOther |
 	packageOriginal := self ensurePackage: #'Test1-TAG1'.

diff --git a/src/Kernel-CodeModel/Package.class.st b/src/Kernel-CodeModel/Package.class.st
@@ -62,7 +62,6 @@ Class {
 
 { #category : 'class initialization' }
 Package class >> initialize [
-	self deprecatedAliases: { #RPackage }.
 	Properties
 		ifNil: [ self initializeProperties ]
 		ifNotNil: [
@@ -403,10 +402,10 @@ Package >> isTestPackage [
 	 2. Or test package contains '-Tests-' in middle.
 	Some examples: "
 
-	"(RPackage named: 'MockPackage-Tests') isTestPackage >>> true"
-	"(RPackage named: 'MockPackage-tests') isTestPackage >>> true"
-	"(RPackage named: 'MockPackage') isTestPackage >>> false"
-	"(RPackage named: 'MockPackage-Tests-Package') isTestPackage >>> true"
+	"(Package named: 'MockPackage-Tests') isTestPackage >>> true"
+	"(Package named: 'MockPackage-tests') isTestPackage >>> true"
+	"(Package named: 'MockPackage') isTestPackage >>> false"
+	"(Package named: 'MockPackage-Tests-Package') isTestPackage >>> true"
 
 	^ (self name endsWith: '-Tests' caseSensitive: false) or: [ self name includesSubstring: '-Tests-' caseSensitive: false ]
 ]

diff --git a/src/Kernel-CodeModel/PackageConflictError.class.st b/src/Kernel-CodeModel/PackageConflictError.class.st
@@ -12,9 +12,3 @@ Class {
 	#package : 'Kernel-CodeModel',
 	#tag : 'Exceptions'
 }
-
-{ #category : 'class initialization' }
-PackageConflictError class >> initialize [
-
-	self deprecatedAliases: { #RPackageConflictError }
-]
diff --git a/src/Kernel-CodeModel/PackageOrganizer.class.st b/src/Kernel-CodeModel/PackageOrganizer.class.st
@@ -24,12 +24,6 @@ PackageOrganizer class >> default [
 	^ self packageOrganizer
 ]
 
-{ #category : 'class initialization' }
-PackageOrganizer class >> initialize [
-
-	self deprecatedAliases: { #RPackageOrganizer }
-]
-
 { #category : 'registration' }
 PackageOrganizer >> addPackage: aPackage [
 

diff --git a/src/Kernel-CodeModel/PackageTag.class.st b/src/Kernel-CodeModel/PackageTag.class.st
@@ -15,12 +15,6 @@ Class {
 	#tag : 'Packages'
 }
 
-{ #category : 'class initialization' }
-PackageTag class >> initialize [
-
-	self deprecatedAliases: { #RPackageTag }
-]
-
 { #category : 'instance creation' }
 PackageTag class >> package: aPackage name: aString [
 

diff --git a/src/Kernel-CodeModel/PseudoVariable.class.st b/src/Kernel-CodeModel/PseudoVariable.class.st
@@ -12,12 +12,6 @@ Class {
 	#tag : 'Variables'
 }
 
-{ #category : 'class initialization' }
-PseudoVariable class >> initialize [
-
-	self deprecatedAliases: { #ReservedVariable }
-]
-
 { #category : 'testing' }
 PseudoVariable class >> isAbstract [
 	^self = PseudoVariable

diff --git a/src/Kernel/MessageNotUnderstood.class.st b/src/Kernel/MessageNotUnderstood.class.st
@@ -14,12 +14,6 @@ Class {
 	#tag : 'Exceptions'
 }
 
-{ #category : 'class initialization' }
-MessageNotUnderstood class >> initialize [
-
-	self deprecatedAliases: { #VariableNotDeclared }
-]
-
 { #category : 'accessing' }
 MessageNotUnderstood >> defaultAction [
 

diff --git a/src/Metacello-Base/ConfigurationOf.class.st b/src/Metacello-Base/ConfigurationOf.class.st
@@ -67,12 +67,6 @@ Class {
 	#package : 'Metacello-Base'
 }
 
-{ #category : 'class initialization' }
-ConfigurationOf class >> initialize [
-
-	self deprecatedAliases: { #MetacelloBaseConfiguration }
-]
-
 { #category : 'accessing' }
 ConfigurationOf class >> project [
 

diff --git a/src/Metacello-Core/MetacelloPlatform.class.st b/src/Metacello-Core/MetacelloPlatform.class.st
@@ -25,8 +25,7 @@ MetacelloPlatform class >> current [
 { #category : 'class initialization' }
 MetacelloPlatform class >> initialize [
 
-	self select.
-	self deprecatedAliases: { #MetacelloPharoPlatform }
+	self select
 ]
 
 { #category : 'initialize-release' }

diff --git a/src/Metacello-Core/MetacelloProject.class.st b/src/Metacello-Core/MetacelloProject.class.st
@@ -15,12 +15,6 @@ Class {
 	#tag : 'Model'
 }
 
-{ #category : 'class initialization' }
-MetacelloProject class >> initialize [
-
-	self deprecatedAliases: { #MetacelloMCProject }
-]
-
 { #category : 'instance creation' }
 MetacelloProject class >> new [
 

diff --git a/src/Metacello-Core/MetacelloProjectSpec.class.st b/src/Metacello-Core/MetacelloProjectSpec.class.st
@@ -19,12 +19,6 @@ Class {
 	#tag : 'Specs'
 }
 
-{ #category : 'class initialization' }
-MetacelloProjectSpec class >> initialize [
-
-	self deprecatedAliases: { #MetacelloMCProjectSpec. #MetacelloGenericProjectSpec }
-]
-
 { #category : 'instance creation' }
 MetacelloProjectSpec class >> new [
 	self name == #MetacelloProjectSpec

diff --git a/src/Metacello-Core/MetacelloTarget.class.st b/src/Metacello-Core/MetacelloTarget.class.st
@@ -13,12 +13,6 @@ Class {
 	#tag : 'Targets'
 }
 
-{ #category : 'class initialization' }
-MetacelloTarget class >> initialize [
-
-	self deprecatedAliases: { #MetacelloCommonMCSpecLoader }
-]
-
 { #category : 'utilities' }
 MetacelloTarget class >> nameComponentsFrom: aVersionName [
 	| ar |

diff --git a/src/Metacello-Core/MetacelloVersion.class.st b/src/Metacello-Core/MetacelloVersion.class.st
@@ -25,11 +25,6 @@ MetacelloVersion class >> fromString: aString [
 	^self new versionNumber: aString asMetacelloVersionNumber
 ]
 
-{ #category : 'class initialization' }
-MetacelloVersion class >> initialize [ 
-	self deprecatedAliases: { #MetacelloMCVersion }
-]
-
 { #category : 'comparing' }
 MetacelloVersion >> < aMetacelloVersion [
 

diff --git a/src/Metacello-Core/MetacelloVersionSpec.class.st b/src/Metacello-Core/MetacelloVersionSpec.class.st
@@ -20,12 +20,6 @@ Class {
 	#tag : 'Specs'
 }
 
-{ #category : 'class initialization' }
-MetacelloVersionSpec class >> initialize [
-
-	self deprecatedAliases: { #MetacelloMCVersionSpec }
-]
-
 { #category : 'visiting' }
 MetacelloVersionSpec >> acceptVisitor: aVisitor [