Merge pull request SeasideSt#89 from GsDevKit/issue_88

Johan Brichau · web-flow · commit 75c83dc29890 · 2019-02-09T09:22:02.000+01:00
Issue 88 - 3.5.0 support and update gemstone lineup
diff --git a/.travis.yml b/.travis.yml
@@ -28,13 +28,13 @@ matrix:
       env: BUILD_NAME=Squeak-5.2
     - smalltalk: Squeak-5.1
       env: BUILD_NAME=Squeak-5.1
-    - smalltalk: GemStone-3.4.2
-      env: BUILD_NAME=GemStone-3.4.2
-    - smalltalk: GemStone-3.3.4
-      env: BUILD_NAME=GemStone-3.3.4
-    - smalltalk: GemStone-3.2.16
-      env: BUILD_NAME=GemStone-3.2.16
+    - smalltalk: GemStone-3.4.3
+      env: BUILD_NAME=GemStone-3.4.3
+    - smalltalk: GemStone-3.3.9
+      env: BUILD_NAME=GemStone-3.3.9
+    - smalltalk: GemStone-3.2.17
+      env: BUILD_NAME=GemStone-3.2.17
     - smalltalk: GemStone-3.1.0.6
       env: BUILD_NAME=GemStone-3.1.0.6
     - smalltalk: GemStone-2.4.8
-      env: BUILD_NAME=GemStone-2.4.8
+      env: BUILD_NAME=GemStone-2.4.8
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
@@ -79,7 +79,7 @@ baselineGemStone: spec
                 requires: #('Grease-GemStone-Core');
                 postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
   spec
-    for: #(#'gs3.3.x' #'gs3.4.x')
+    for: #(#'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x')
     do: [ 
       spec
         package: 'Grease-GemStone-Core'
@@ -90,7 +90,7 @@ baselineGemStone: spec
                 requires: #('Grease-GemStone-Core');
                 postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ].
   spec
-    for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x')
+    for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x')
     do: [ 
       spec
         package: 'Grease-Tests-GemStone-Core'
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json b/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json
@@ -0,0 +1,10 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"baseline:" : " 02/08/2019 09:34:04",
+		"baselineCommon:" : " 02/08/2019 09:34:04",
+		"baselineGemStone:" : "dkh 02/08/2019 09:35",
+		"baselinePharo:" : " 02/08/2019 09:34:04",
+		"baselineSqueak:" : " 02/08/2019 09:34:04",
+		"initializeLatin1ToUtf8Encodings" : " 02/08/2019 09:34:04" } }
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/monticello.meta/categories.st b/repository/BaselineOfGrease.package/monticello.meta/categories.st
@@ -1 +1 @@
-SystemOrganization addCategory: #BaselineOfGrease!
+SystemOrganization addCategory: #'BaselineOfGrease'!
diff --git a/repository/BaselineOfGrease.package/monticello.meta/version b/repository/BaselineOfGrease.package/monticello.meta/version
@@ -0,0 +1 @@
+(name 'BaselineOfGrease-dkh.2' message 'Issue #88: add 3.5 and 3.6 (thinking about future) to baseline' id '9141ab69-c0a0-4718-ac99-fd5fe9de2c6d' date '02/08/2019' time '09:36:09' author 'dkh' ancestors ((name 'BaselineOfGrease-cypress.1' message 'fabricated from a Cypress format repository' id 'e86a3b9e-ded9-4e86-a47c-06bdd15e26fd' date '02/08/2019' time '09:34:04' author '' ancestors () stepChildren ())) stepChildren ())
diff --git a/repository/BaselineOfGrease.package/properties.json b/repository/BaselineOfGrease.package/properties.json
@@ -1 +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
`@@ -1 +1 @@`
`1`		`-SystemOrganization addCategory: #BaselineOfGrease!`
	`1`	`+SystemOrganization addCategory: #'BaselineOfGrease'!`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+(name 'BaselineOfGrease-dkh.2' message 'Issue #88: add 3.5 and 3.6 (thinking about future) to baseline' id '9141ab69-c0a0-4718-ac99-fd5fe9de2c6d' date '02/08/2019' time '09:36:09' author 'dkh' ancestors ((name 'BaselineOfGrease-cypress.1' message 'fabricated from a Cypress format repository' id 'e86a3b9e-ded9-4e86-a47c-06bdd15e26fd' date '02/08/2019' time '09:34:04' author '' ancestors () stepChildren ())) stepChildren ())`