Use shift class builder to build traits

src/Hermes-Tests/HEInstallerSimpleTest.class.st

@@ -253,7 +253,7 @@ HEInstallerSimpleTest >> testUndeclared [
 
 	| exportedClass |
 	"If we run the test multiple times we need to do this to be sure #AnUndeclaredClass is not in the Undeclared dictionary anymore."
-	Undeclared removeUnreferencedKeys.
+	Smalltalk image cleanOutUndeclared.
 	[
 	UndefinedObject compile: 'xxx
 		^ AnUndeclaredClass'.

src/Hermes/HEInstaller.class.st

@@ -60,23 +60,19 @@ HEInstaller >> build: aHEClass [
 
 { #category : 'creating traits' }
 HEInstaller >> buildTrait: aTraitDefinition [
-	| newTrait traitComposition traitClass|
-
-	(self existingTrait: aTraitDefinition) ifNotNil: [:x | ^ x ].
-
-	traitClass := Smalltalk globals at: #Trait ifAbsent: [ self error: 'Trait support is not installed' ].
-
-	traitComposition := self buildTraitCompositionFor: aTraitDefinition traitComposition.	
-
-	newTrait := traitClass
-		named: aTraitDefinition traitName
-		uses: traitComposition
-		package: aTraitDefinition category
-		env: environment.
 
-	newTrait classTrait traitComposition: (self buildTraitCompositionFor: aTraitDefinition classTraitComposition).
+	(self existingTrait: aTraitDefinition) ifNotNil: [ :x | ^ x ].
+
+	self supportsTraits ifFalse: [ self error: 'Trait support is not installed' ].
 
-	^ newTrait
+	^ self class classInstaller make: [ :builder |
+		  builder
+			  beTrait;
+			  name: aTraitDefinition traitName;
+			  uses: (self buildTraitCompositionFor: aTraitDefinition traitComposition);
+			  classTraitComposition: (self buildTraitCompositionFor: aTraitDefinition classTraitComposition);
+			  package: aTraitDefinition category;
+			  environment: environment ]
 ]
 
 { #category : 'creating traits' }