Merge pull request #195 from OpenSmock/dev-baseline

Change toplo branch
OpenSmock · Jul 22, 2024 · 7073419 · 7073419
2 parents 974a5fc + 11ca021
commit 7073419
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 26 deletions.
diff --git a/src/BaselineOfPyramid/BaselineOfPyramid.class.st b/src/BaselineOfPyramid/BaselineOfPyramid.class.st
@@ -1,19 +1,18 @@
 Class {
-	#name : 'BaselineOfPyramid',
-	#superclass : 'BaselineOf',
-	#category : 'BaselineOfPyramid',
-	#package : 'BaselineOfPyramid'
+	#name : #BaselineOfPyramid,
+	#superclass : #BaselineOf,
+	#category : #BaselineOfPyramid
 }
 
-{ #category : 'baselines' }
+{ #category : #baselines }
 BaselineOfPyramid >> baseline: spec [
 
 	<baseline>
 	"Common baseline for all Pharo versions"
 	spec for: #common do: [ self baselineForCommon: spec ]
 ]
 
-{ #category : 'baselines' }
+{ #category : #baselines }
 BaselineOfPyramid >> baselineForCommon: spec [
 
 	<baseline>
@@ -35,50 +34,49 @@ BaselineOfPyramid >> baselineForCommon: spec [
 	spec group: 'ToploUI' with: self toploPackagesNames "only Bloc and Toplo"
 ]
 
-{ #category : 'dependencies' }
+{ #category : #dependencies }
 BaselineOfPyramid >> blocDependencies: spec [
-
-	spec
-		baseline: 'Bloc'
-		with: [ spec repository: 'github://pharo-graphics/Bloc:master/src' ].
+
 	spec
 		baseline: 'BlocSerialization'
 		with: [
 		spec repository: 'github://OpenSmock/Bloc-Serialization:main/src' ]
 ]
 
-{ #category : 'packages' }
+{ #category : #packages }
 BaselineOfPyramid >> blocPackages: spec [
 
 	spec
 		package: 'Pyramid-Bloc'
-		with: [ spec requires: #( 'Pyramid' 'Bloc' ) ].
+		with: [ spec requires: #( 'Pyramid' ) ].
+
 	spec
 		package: 'Pyramid-Tests'
 		with: [ spec requires: #( 'Pyramid-Bloc' ) ].
+
 	spec
 		package: 'Pyramid-Examples'
 		with: [ spec requires: #( 'Pyramid-Bloc' ) ]
 ]
 
-{ #category : 'packages' }
+{ #category : #packages }
 BaselineOfPyramid >> blocPackagesNames [
 
 	^ #( 'Pyramid' 'Pyramid-Bloc' 'Pyramid-Tests' 'Pyramid-IDE' 'Pyramid-Examples' )
 ]
 
-{ #category : 'actions' }
+{ #category : #actions }
 BaselineOfPyramid >> postload: loader package: packageSpec [
 
 	PyramidPluginManager reset
 ]
 
-{ #category : 'actions' }
+{ #category : #actions }
 BaselineOfPyramid >> preload: loader package: packageSpec [
 
 ]
 
-{ #category : 'packages' }
+{ #category : #packages }
 BaselineOfPyramid >> pyramidPackages: spec [
 
 	spec package: 'Pyramid'.
@@ -88,33 +86,32 @@ BaselineOfPyramid >> pyramidPackages: spec [
 
 ]
 
-{ #category : 'dependencies' }
+{ #category : #dependencies }
 BaselineOfPyramid >> toploDependencies: spec [
-
-	spec
-		baseline: 'Toplo'
-		with: [ spec repository: 'github://pharo-graphics/Toplo:master/src' ].
+
 	spec
 		baseline: 'ToploSerialization'
 		with: [
 		spec repository: 'github://OpenSmock/Toplo-Serialization:main/src' ]
 ]
 
-{ #category : 'packages' }
+{ #category : #packages }
 BaselineOfPyramid >> toploPackages: spec [
 
 	spec
 		package: 'Pyramid-Toplo'
-		with: [ spec requires: #( 'Toplo' 'ToploSerialization') ].
+		with: [ spec requires: #( 'ToploSerialization') ].
+
 	spec
 		package: 'Pyramid-Toplo-Tests'
 		with: [ spec requires: #( 'Pyramid-Toplo' ) ].
+
 	spec
 		package: 'Pyramid-Toplo-Examples'
 		with: [ spec requires: #( 'Pyramid-Toplo' ) ]
 ]
 
-{ #category : 'packages' }
+{ #category : #packages }
 BaselineOfPyramid >> toploPackagesNames [
 
 	| packages |

diff --git a/src/BaselineOfPyramid/package.st b/src/BaselineOfPyramid/package.st
@@ -1 +1 @@
-Package { #name : 'BaselineOfPyramid' }
+Package { #name : #BaselineOfPyramid }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Package { #name : 'BaselineOfPyramid' }
		Package { #name : #BaselineOfPyramid }