fix resolveWith: older version package names are used in later Pharo …

…versions
SeasideSt · Jan 14, 2024 · 55f34f4 · 55f34f4
1 parent c4074b0
commit 55f34f4
Showing 1 changed file with 23 additions and 17 deletions.
diff --git a/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st b/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st
@@ -5,20 +5,26 @@ resolveWith: aDictionary
 			aDictionary at: each ifAbsent: [
 				"if Foo-Pharo-Bar fails try Foo-Pharo20-Bar and Foo-Pharo30-Bar"
 				(each indexOfSubCollection: '-Pharo-' startingAt: 1) ~= 0 ifTrue: [
-						"try -Pharo70-"
-						aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo70-') ifAbsent: [
-							"try -Pharo90-"
-							aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo90-') ifAbsent: [
-								"try -Pharo100-"
-								aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo100-') ifAbsent: [
-									"try -Pharo110-"
-									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 ] ] ] ] ] ] ] ] ] ] ]
+					"try -Pharo40-"
+					aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo40-') ifAbsent: [
+						"try -Pharo50-"
+						aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo50-') ifAbsent: [
+							"try -Pharo60-"
+							aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo60-') ifAbsent: [
+								"try -Pharo70-"
+								aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo70-') ifAbsent: [
+									"try -Pharo90-"
+									aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo90-') ifAbsent: [
+										"try -Pharo100-"
+										aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo100-') ifAbsent: [
+											"try -Pharo110-"
+											aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo110-') 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 ] ] ] ] ] ] ] ] ] ] ] ] ] ]