With recent Ston work (GsDevKit/ston#6) switch up baseline to same br…

…anch/tag for Ston ...
dalehenrich · Jun 26, 2015 · e53205e · e53205e
1 parent 31c76b3
commit e53205e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 12 deletions.
diff --git a/repository/BaselineOfTode.package/BaselineOfTode.class/instance/baseline..st b/repository/BaselineOfTode.package/BaselineOfTode.class/instance/baseline..st
@@ -4,7 +4,10 @@ baseline: spec
   spec
     for: #'common'
     do: [ 
-      spec baseline: 'Ston'.
+      spec
+        baseline: 'Ston'
+          with: [ spec repository: 'github://GsDevKit/ston:v0.9.?/repository' ];
+        yourself.
       spec
         package: 'Topez-Common-Core' with: [ spec requires: #('Ston') ];
         package: 'Topez-Server-Core'
@@ -43,9 +46,6 @@ baseline: spec
   spec
     for: #'pharo'
     do: [ 
-      spec
-        baseline: 'Ston'
-        with: [ spec repository: 'github://GsDevKit/ston:pharo-0.9.?/repository' ].
       spec
         package: 'Topez-Pharo-Common';
         package: 'Tode-Pharo-Server-Core'
@@ -120,8 +120,6 @@ baseline: spec
               spec
                 loads: #('AST-Core');
                 repository: 'github://dalehenrich/rb:dev/repository' ];
-        baseline: 'Ston'
-          with: [ spec repository: 'github://GsDevKit/ston:v0.9.?/repository' ];
         baseline: 'FileTree'
           with: [ spec repository: 'github://dalehenrich/filetree:gemstone2.4_dev/repository' ];
         yourself.

diff --git a/repository/BaselineOfTode.package/BaselineOfTode.class/methodProperties.json b/repository/BaselineOfTode.package/BaselineOfTode.class/methodProperties.json
@@ -2,5 +2,5 @@
 	"class" : {
 		 },
 	"instance" : {
-		"baseline:" : "dkh 06/25/2015 09:43",
+		"baseline:" : "dkh 06/26/2015 14:21",
 		"initializeTools" : "dkh 06/06/2013 11:59" } }
diff --git a/repository/BaselineOfTode.package/monticello.meta/version b/repository/BaselineOfTode.package/monticello.meta/version
diff --git a/repository/Topez-Common-Core.package/TodeSTON051ObjectSerializer.class/methodProperties.json b/repository/Topez-Common-Core.package/TodeSTON051ObjectSerializer.class/methodProperties.json
@@ -2,7 +2,7 @@
 	"class" : {
 		 },
 	"instance" : {
-		"fromString:" : "dkh 06/25/2015 15:04",
+		"fromString:" : "dkh 06/26/2015 12:29",
 		"protocolVersionString" : "dkh 06/25/2015 15:04",
 		"toString:" : "dkh 06/25/2015 15:04",
 		"toStringPretty:" : "dkh 6/25/2015 16:59" } }
diff --git a/repository/Topez-Common-Core.package/TodeSTON091Serializer.class/instance/fromString..st b/repository/Topez-Common-Core.package/TodeSTON091Serializer.class/instance/fromString..st
@@ -1,3 +1,3 @@
 serialization
 fromString: aString
-  ^ STON fromUTF8EncodedString: aString
+  ^ (STON091Reader on: aString decodeFromUTF8 readStream) next
diff --git a/repository/Topez-Common-Core.package/TodeSTON091Serializer.class/methodProperties.json b/repository/Topez-Common-Core.package/TodeSTON091Serializer.class/methodProperties.json
@@ -2,7 +2,7 @@
 	"class" : {
 		 },
 	"instance" : {
-		"fromString:" : "dkh 06/25/2015 15:04",
+		"fromString:" : "dkh 06/26/2015 12:23",
 		"protocolVersionString" : "dkh 06/25/2015 15:04",
 		"toString:" : "dkh 06/25/2015 15:04",
 		"toStringPretty:" : "dkh 6/25/2015 16:59" } }
diff --git a/repository/Topez-Common-Core.package/monticello.meta/version b/repository/Topez-Common-Core.package/monticello.meta/version