Fix GRPackage packaging descriptions and tests

SeasideSt · Jan 31, 2021 · 5120c51 · 5120c51
1 parent c4823c5
commit 5120c51
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 21 deletions.
diff --git a/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st b/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st
@@ -5,22 +5,20 @@ 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 -Pharo20-"
-					aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo20-') ifAbsent: [
-						"try -Pharo30-"
-						aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo30-') ifAbsent: [
-							"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 -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: [
-													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 -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: [
+												self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ] ]
diff --git a/repository/Grease-Pharo90-Core.package/GRPackage.extension/class/greasePharo70Core.st b/repository/Grease-Pharo90-Core.package/GRPackage.extension/class/greasePharo70Core.st
@@ -1,7 +1,7 @@
 *Grease-Pharo90-Core
 greasePharo70Core
 	^ self new
-		name: 'Grease-Pharo70-Core';
+		name: 'Grease-Pharo90-Core';
 		addDependency: 'Grease-Core';
 		url: #greaseUrl;
 		yourself
diff --git a/repository/Grease-Pharo90-Slime.package/GRPackage.extension/class/greaseSlime.st b/repository/Grease-Pharo90-Slime.package/GRPackage.extension/class/greaseSlime.st
@@ -1,7 +1,7 @@
 *Grease-Pharo90-Slime
 greaseSlime
 	^ self new
-		name: 'Grease-Pharo40-Slime';
+		name: 'Grease-Pharo90-Slime';
 		description: 'Code critis for Grease. Detects common types of bugs and non-portable code.';
 		addDependency: 'Grease-Core';
 		url: #seasideUrl;