utf8 encoding changes in Pharo9: clean up GRPlatform implementation and make the testLanguageTag make the switch only in Pharo9

Johan Brichau · Johan Brichau · commit c4823c57db1d · 2021-01-19T08:15:51.000+01:00
diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/initialize.st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/initialize.st
diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/setutf8CodectoDeprecatedTextConverter.st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/setutf8CodectoDeprecatedTextConverter.st
@@ -0,0 +1,4 @@
+utf8 codec
+setutf8CodectoDeprecatedTextConverter
+	"Set to the GRPharoDeprecatedUtf8Codec that uses the deprecated TextConverter for utf8 encoding"
+	utf8DeprecatedCodecFlag := true
diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/setutf8CodectoZinc.st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/setutf8CodectoZinc.st
@@ -0,0 +1,4 @@
+utf8 codec
+setutf8CodectoZinc
+	"Set to GRPharoUtf8Codec that uses Zinc for utf8 encoding"
+	utf8DeprecatedCodecFlag := nil
diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/utf8CodecClass..st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/utf8CodecClass..st
diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/utf8CodecClass.st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/utf8CodecClass.st
@@ -1,3 +1,6 @@
-private
+utf8 codec
 utf8CodecClass
-	^ utf8CodecClass
+
+	^ utf8DeprecatedCodecFlag
+		  ifNil: [ GRPharoUtf8Codec ]
+		  ifNotNil: [ GRPharoDeprecatedUtf8Codec ]
diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/properties.json b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/properties.json
@@ -9,7 +9,7 @@
 		"XmlTable"
 	],
 	"instvars" : [
-		"utf8CodecClass"
+		"utf8DeprecatedCodecFlag"
 	],
 	"name" : "GRPharoPlatform",
 	"type" : "normal"
diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPharoCodecTest.class/instance/testLanguageTag.st b/repository/Grease-Tests-Pharo-Core.package/GRPharoCodecTest.class/instance/testLanguageTag.st
@@ -1,19 +1,21 @@
 tests
 testLanguageTag
+
 	"this makes sure the encoder doesn't fall on the nose with unicode"
+
 	"Make Japanese String from unicode. see http://www.unicode.org/charts/PDF/U3040.pdf"
+
 	| leading hiraA hiraO hiraAO |
-	GRPlatform current utf8CodecClass: GRPharoDeprecatedUtf8Codec.
+	SystemVersion current major >= 9 ifTrue: [ 
+		GRPlatform current setutf8CodectoDeprecatedTextConverter ].
 	[ 
 	leading := (Smalltalk classNamed: #JapaneseEnvironment) leadingChar.
-	hiraA := (Character 
-		leadingChar: leading
-		code: 12354) greaseString.	"HIRAGANA LETTER A"
-	hiraO := (Character 
-		leadingChar: leading
-		code: 12362) greaseString.	"HIRAGANA LETTER O"
+	hiraA := (Character leadingChar: leading code: 12354) greaseString. "HIRAGANA LETTER A"
+	hiraO := (Character leadingChar: leading code: 12362) greaseString. "HIRAGANA LETTER O"
 	hiraAO := hiraA , hiraO.
 	self assertEncodingIgnoresLanguageTat: hiraA.
 	self assertEncodingIgnoresLanguageTat: hiraO.
 	self assertEncodingIgnoresLanguageTat: hiraAO 
-	] ensure: [ GRPlatform current utf8CodecClass: GRPharoUtf8Codec. ]
+	] ensure: [ 
+		SystemVersion current major >= 9 ifTrue: [ 
+			GRPlatform current setutf8CodectoZinc ] ]
