Merge remote-tracking branch 'gsdevkit/master'

Johan Brichau · Johan Brichau · commit 05a6c4ea572d · 2023-09-12T10:43:34.000+02:00
# Conflicts:
#	.github/workflows/ci.yml
#	repository/BaselineOfGrease.package/monticello.meta/categories.st
diff --git a/repository/BaselineOfGrease.package/.filetree b/repository/BaselineOfGrease.package/.filetree
@@ -1,5 +1,4 @@
 {
-	"separateMethodMetaAndSource" : false,
 	"noMethodMetaData" : true,
-	"useCypressPropertiesFile" : true
-}
+	"separateMethodMetaAndSource" : false,
+	"useCypressPropertiesFile" : true }
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselineGemStone..st
@@ -97,7 +97,7 @@ baselineGemStone: spec
         	 with: [ spec includes: 'Grease-Tests-GemStone-Core' ] ].
 
   spec
-    for: #( #'gs3.5.4.x' #'gs3.5.5.x' #'gs3.5.6.x' #'gs3.5.7.x' )
+    for: #( #'gs3.5.4.x' #'gs3.5.5.x' #'gs3.5.6.x' #'gs3.5.7.x' #'gs3.5.8.x' #'gs3.5.9.x' )
     do: [ 
       spec
         package: 'Grease-GemStone-Core'
@@ -116,11 +116,21 @@ baselineGemStone: spec
           with: [ 
               spec
                 requires: #('Grease-GemStone-Core') ] ].
+  spec
+    for: #( #'gs3.7.x' #'gs3.8.x' #'gs3.9.x')
+    do: [ 
+      spec
+        package: 'Grease-GemStone-Core'
+          with: [ spec includes: #('Grease-GemStone-Kernelv370') ];
+        package: 'Grease-GemStone-Kernelv370'
+          with: [ 
+              spec
+                requires: #('Grease-GemStone-Core') ] ].
   spec
     for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x' #'gs3.7.x' #'gs3.8.x' #'gs3.9.x')
     do: [ 
       spec
         package: 'Grease-Tests-GemStone32-Core'
 		    with:[ spec requires: 'Grease-Tests-Core' ];
 		  package: 'Grease-Tests-Core'
-        	 with: [ spec includes: 'Grease-Tests-GemStone32-Core' ] ]
+        	 with: [ spec includes: 'Grease-Tests-GemStone32-Core' ] ]
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json b/repository/BaselineOfGrease.package/BaselineOfGrease.class/properties.json
@@ -1,11 +1,14 @@
 {
-	"commentStamp" : "",
-	"super" : "BaselineOf",
 	"category" : "BaselineOfGrease",
-	"classinstvars" : [ ],
-	"pools" : [ ],
-	"classvars" : [ ],
-	"instvars" : [ ],
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
 	"name" : "BaselineOfGrease",
-	"type" : "normal"
-}
+	"pools" : [
+		 ],
+	"super" : "BaselineOf",
+	"type" : "normal" }
diff --git a/repository/BaselineOfGrease.package/properties.json b/repository/BaselineOfGrease.package/properties.json
@@ -1 +1,2 @@
-{ }
+{
+	 }
diff --git a/repository/Grease-GemStone-Kernelv370.package/.filetree b/repository/Grease-GemStone-Kernelv370.package/.filetree
@@ -0,0 +1,4 @@
+{
+	"noMethodMetaData" : true,
+	"separateMethodMetaAndSource" : false,
+	"useCypressPropertiesFile" : true }
diff --git a/repository/Grease-GemStone-Kernelv370.package/ReadByteStreamPortable.extension/instance/greaseUpToAll..st b/repository/Grease-GemStone-Kernelv370.package/ReadByteStreamPortable.extension/instance/greaseUpToAll..st
@@ -0,0 +1,6 @@
+*grease-gemstone-kernelv370
+greaseUpToAll: aCollection
+	"Needed for Seaside ports to other dialects where #upToAll: may have
+	different semantics"
+
+	^self upToAll: aCollection
diff --git a/repository/Grease-GemStone-Kernelv370.package/ReadByteStreamPortable.extension/properties.json b/repository/Grease-GemStone-Kernelv370.package/ReadByteStreamPortable.extension/properties.json
@@ -0,0 +1,2 @@
+{
+	"name" : "ReadByteStreamPortable" }
diff --git a/repository/Grease-GemStone-Kernelv370.package/monticello.meta/initializers.st b/repository/Grease-GemStone-Kernelv370.package/monticello.meta/initializers.st
diff --git a/repository/Grease-GemStone-Kernelv370.package/monticello.meta/package b/repository/Grease-GemStone-Kernelv370.package/monticello.meta/package
@@ -0,0 +1 @@
+(name 'Grease-GemStone-Kernelv370')
diff --git a/repository/Grease-GemStone-Kernelv370.package/properties.json b/repository/Grease-GemStone-Kernelv370.package/properties.json
@@ -0,0 +1,2 @@
+{
+	 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`{`
`2`		`- "separateMethodMetaAndSource" : false,`
`3`	`2`	`"noMethodMetaData" : true,`
`4`		`- "useCypressPropertiesFile" : true`
`5`		`-}`
	`3`	`+ "separateMethodMetaAndSource" : false,`
	`4`	`+ "useCypressPropertiesFile" : true }`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+{`
	`2`	`+ "name" : "ReadByteStreamPortable" }`