Merge pull request SeasideSt#136 from SeasideSt/grpackage-pharo100

Johan Brichau · web-flow · commit c753fef465bf · 2022-04-03T10:36:09.000+02:00
fix grpackage methods for pharo100 (useless?)
diff --git a/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st b/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st
@@ -14,13 +14,15 @@ resolveWith: aDictionary
 								"try -Pharo70-"
 								aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo70-') ifAbsent: [
 									"try -Pharo90-"
-									aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo90-') ifAbsent: [									
-										"try -Squeak-"
-										aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [
-											"try -Squeak5-"
-											aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [
-												"try -Squeak6-"
-												aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak6-') ifAbsent: [
-													"specific for Grease-Slime"
-													aDictionary at: (each copyReplaceAll: 'Grease-Pharo-Slime' with: 'Grease-Slime') ifAbsent: [
-														self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ] ] ]
+									aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo90-') ifAbsent: [
+										"try -Pharo100-"
+										aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo100-') ifAbsent: [								
+											"try -Squeak-"
+											aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [
+												"try -Squeak5-"
+												aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [
+													"try -Squeak6-"
+													aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak6-') ifAbsent: [
+														"specific for Grease-Slime"
+														aDictionary at: (each copyReplaceAll: 'Grease-Pharo-Slime' with: 'Grease-Slime') ifAbsent: [
+															self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ] ] ] ]
diff --git a/repository/Grease-Core.package/GRPlatform.class/instance/version.st b/repository/Grease-Core.package/GRPlatform.class/instance/version.st
@@ -2,5 +2,5 @@ version info
 version
 	"Answer the Grease version"
 
-	^ (GRVersion major: 1 minor: 8 revision: 1)
+	^ (GRVersion major: 1 minor: 8 revision: 2)
 		yourself
diff --git a/repository/Grease-Pharo100-Core.package/GRPackage.extension/class/greasePharo100Core.st b/repository/Grease-Pharo100-Core.package/GRPackage.extension/class/greasePharo100Core.st
@@ -1,7 +1,7 @@
 *Grease-Pharo100-Core
-greasePharo70Core
+greasePharo100Core
 	^ self new
-		name: 'Grease-Pharo90-Core';
+		name: 'Grease-Pharo100-Core';
 		addDependency: 'Grease-Core';
 		url: #greaseUrl;
 		yourself
diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPlatformTest.extension/instance/expectedFailures.st b/repository/Grease-Tests-Pharo-Core.package/GRPlatformTest.extension/instance/expectedFailures.st
@@ -0,0 +1,6 @@
+*Grease-Tests-Pharo-Core
+expectedFailures
+	"Fails in Pharo 10 until https://github.com/svenvc/zinc/issues/86 is part of Pharo 10"
+	^ SystemVersion current major = 10
+		ifTrue:[ #(#testReadWriteEmptyFileInFolderBinary) ]
+		ifFalse: [ #() ]
