Upgrade to grease 1.6 and fix svg files in WADevelopmentFiles

SeasideSt · Jul 31, 2020 · f8bb0de · f8bb0de
1 parent 22854f2
commit f8bb0de
Show file tree

Hide file tree

Showing 9 changed files with 2,212 additions and 33 deletions.
diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinecommon..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinecommon..st
@@ -7,7 +7,7 @@ baselinecommon: spec
         	with: [ 
 				spec
 					loads: #('Grease-Core');
-					repository: 'github://SeasideSt/Grease:v1.5.x/repository' ].
+					repository: 'github://SeasideSt/Grease:v1.6.x/repository' ].
 		spec
 			project: 'Grease Core Tests' copyFrom: 'Grease' with: [ 
 				spec loads: #('Core Tests') ] 

diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinepharo..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinepharo..st
@@ -20,22 +20,6 @@ baselinepharo: spec
 				package: 'Seaside-Tests-Canvas' with: [ spec includes: #('Seaside-Tests-Pharo-Canvas') ];
 				package: 'Seaside-Tests-Pharo-Canvas' with: [ spec requires: #('Seaside-Tests-Canvas') ] ].
 
-	spec
-		for: #squeak
-		do: [ spec
-				package: 'Seaside-Tools-Web' with: [ spec includes: #('Seaside-Squeak-Tools-Web') ];
-				package: 'Seaside-Pharo-Development' with: [ spec requires: #('Seaside-Development' 'Seaside-Squeak-Tools-Web' 'Seaside-Pharo-Flow') ];
-				package: 'Seaside-Squeak-Tools-Web' with: [ spec requires: #('Seaside-Tools-Web' 'Seaside-Core' 'Seaside-Canvas') ];
-				package: 'Seaside-Squeak-Continuation' with: [ spec requires: #('Seaside-Core') ];
-				package: 'Seaside-Pharo-Flow' with: [ spec requires: #('Seaside-Flow' 'Seaside-Squeak-Continuation') ];
-				package: 'Seaside-Tests-Pharo-Continuation' with: [ spec requires: #('Seaside-Squeak-Continuation') ];
-				package: 'Seaside-Core' with: [ spec includes: #('Seaside-Squeak-Core') ];
-				package: 'Seaside-Squeak-Core' with: [ spec requires: #('Seaside-Core') ];
-				package: 'Seaside-Tests-Core' with: [ spec includes: #('Seaside-Tests-Squeak-Core') ];
-				package: 'Seaside-Tests-Squeak-Core' with: [ spec requires: #('Seaside-Squeak-Core' 'Seaside-Tests-Core') ];
-				package: 'Seaside-Tests-Pharo-Functional' with: [ spec requires: #('Seaside-Tests-Squeak-Core') ];
-				package: 'Seaside-Pharo-Email' with: [ spec requires: #('Seaside-Email' 'Seaside-Squeak-Core') ] ].
-
 	spec
 		for: #pharo
 		do: [ spec

diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinesqueak..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinesqueak..st
@@ -1,12 +1,25 @@
 baselines
 baselinesqueak: spec
 
-	spec for: #squeak do: [
+	"Mind that baselinepharo still has a squeakcommon section!"
+	spec
+		for: #squeak
+		do: [ 
+			spec
+				package: 'Seaside-Squeak-Compatibility';
+				package: 'Seaside-Squeak-Core' with: [ spec requires: #('Seaside-Core') ];
+				package: 'Seaside-Core' with:[ spec includes: #('Seaside-Squeak-Core' 'Seaside-Squeak-Compatibility' ) ];
+				package: 'Seaside-Tools-Web' with: [ spec includes: #('Seaside-Squeak-Tools-Web') ];
+				package: 'Seaside-Pharo-Development' with: [ spec requires: #('Seaside-Development' 'Seaside-Squeak-Tools-Web' 'Seaside-Pharo-Flow') ];
+				package: 'Seaside-Squeak-Tools-Web' with: [ spec requires: #('Seaside-Tools-Web' 'Seaside-Core' 'Seaside-Canvas') ];
+				package: 'Seaside-Squeak-Continuation' with: [ spec requires: #('Seaside-Core') ];
+				package: 'Seaside-Pharo-Flow' with: [ spec requires: #('Seaside-Flow' 'Seaside-Squeak-Continuation') ];
+				package: 'Seaside-Tests-Pharo-Continuation' with: [ spec requires: #('Seaside-Squeak-Continuation') ];
 
-		spec 
-			package: 'Seaside-Squeak-Compatibility';
-			package: 'Seaside-Core' with:[ spec includes: #('Seaside-Squeak-Compatibility' ). ]
-		].
+				package: 'Seaside-Tests-Core' with: [ spec includes: #('Seaside-Tests-Squeak-Core') ];
+				package: 'Seaside-Tests-Squeak-Core' with: [ spec requires: #('Seaside-Squeak-Core' 'Seaside-Tests-Core') ];
+				package: 'Seaside-Tests-Pharo-Functional' with: [ spec requires: #('Seaside-Tests-Squeak-Core') ];
+				package: 'Seaside-Pharo-Email' with: [ spec requires: #('Seaside-Email' 'Seaside-Squeak-Core') ] ].
 
 	"ToolBuilder based tools"
 	spec for: #(#'squeak4.6.x' #'squeak5.x') do: [

diff --git a/repository/Seaside-Core.package/GRPlatform.extension/instance/seasideVersion.st b/repository/Seaside-Core.package/GRPlatform.extension/instance/seasideVersion.st
@@ -2,5 +2,5 @@
 seasideVersion
 	"Answer the Seaside version"
 
-	^ (GRVersion major: 3 minor: 4 revision: 1)
+	^ (GRVersion major: 3 minor: 4 revision: 3)
 		yourself
diff --git a/repository/Seaside-Development.package/WADevelopmentFiles.class/instance/codebrowserSvg.st b/repository/Seaside-Development.package/WADevelopmentFiles.class/instance/codebrowserSvg.st
diff --git a/repository/Seaside-Development.package/WADevelopmentFiles.class/instance/inspectorSvg.st b/repository/Seaside-Development.package/WADevelopmentFiles.class/instance/inspectorSvg.st
diff --git a/repository/Seaside-Development.package/WADevelopmentFiles.class/instance/styleeditorSvg.st b/repository/Seaside-Development.package/WADevelopmentFiles.class/instance/styleeditorSvg.st
diff --git a/repository/Seaside-Development.package/monticello.meta/categories.st b/repository/Seaside-Development.package/monticello.meta/categories.st
@@ -1,4 +1,4 @@
 SystemOrganization addCategory: #'Seaside-Development'!
-SystemOrganization addCategory: 'Seaside-Development-Core'!
-SystemOrganization addCategory: 'Seaside-Development-Filter'!
-SystemOrganization addCategory: 'Seaside-Development-Plugins'!
+SystemOrganization addCategory: #'Seaside-Development-Core'!
+SystemOrganization addCategory: #'Seaside-Development-Filter'!
+SystemOrganization addCategory: #'Seaside-Development-Plugins'!
diff --git a/repository/Seaside-Development.package/monticello.meta/version b/repository/Seaside-Development.package/monticello.meta/version