From 43c850ddea9170d0fc8d5ebdd089fd32db4c6005 Mon Sep 17 00:00:00 2001
From: Johan Brichau <johan@yesplan.be>
Date: Fri, 26 May 2017 16:01:08 +0200
Subject: [PATCH] Pharo6 compatibility: GRPackage>>resolve:with: should take
 -Pharo6.0- names into account

---
 .../GRPackage.class/instance/resolveWith..st  | 12 +++---
 .../GRPackage.class/methodProperties.json     | 37 ++++++++++---------
 .../GRPackage.class/properties.json           | 19 +++++-----
 3 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st b/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st
index e4a1a0f1..21b09d23 100644
--- a/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st
+++ b/repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st
@@ -13,8 +13,10 @@ resolveWith: aDictionary
 							aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo40-') ifAbsent: [
 								"try -Pharo50-"
 								aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo50-') ifAbsent: [
-									"try -Squeak-"
-									aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [
-										"try -Squeak5-"
-										aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [
-											self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ]
\ No newline at end of file
+									"try -Pharo60-"
+									aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo60-') ifAbsent: [
+										"try -Squeak-"
+										aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak-') ifAbsent: [
+											"try -Squeak5-"
+											aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Squeak5-') ifAbsent: [
+											self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ] ] ] ]
\ No newline at end of file
diff --git a/repository/Grease-Core.package/GRPackage.class/methodProperties.json b/repository/Grease-Core.package/GRPackage.class/methodProperties.json
index ce5159dd..784ba29c 100644
--- a/repository/Grease-Core.package/GRPackage.class/methodProperties.json
+++ b/repository/Grease-Core.package/GRPackage.class/methodProperties.json
@@ -1,26 +1,29 @@
 {
-	"class" : {
-		"grPackages" : "JohanBrichau 12/15/2013 18:27",
-		"greaseCore" : "pmm 9/12/2013 16:00" },
 	"instance" : {
-		"addDependenciesTo:" : "lr 9/5/2009 18:35",
-		"addDependency:" : "merged 10/20/2008 09:33",
-		"allDependencies" : "lr 2/17/2010 15:18",
 		"dependencies" : "jf 3/15/2009 17:00",
-		"description" : "merged 10/20/2008 09:23",
-		"description:" : "lr 10/25/2009 11:26",
-		"greaseUrl" : "pmm 9/12/2013 15:57",
+		"license:" : "obi 10/8/2009 07:51",
 		"initialize" : "lr 2/17/2010 15:06",
-		"isLGPL" : "lr 10/25/2009 15:19",
-		"isMIT" : "lr 10/25/2009 15:19",
 		"license" : "lr 2/10/2010 11:18",
-		"license:" : "obi 10/8/2009 07:51",
 		"name" : "lr 2/17/2010 15:18",
+		"description:" : "lr 10/25/2009 11:26",
+		"seasideUrl" : "pmm 9/12/2013 15:58",
+		"allDependencies" : "lr 2/17/2010 15:18",
+		"isLGPL" : "lr 10/25/2009 15:19",
+		"seasideLGPLUrl" : "pmm 9/12/2013 15:59",
+		"greaseUrl" : "pmm 9/12/2013 15:57",
 		"name:" : "lr 10/25/2009 11:26",
-		"printOn:" : "merged 10/20/2008 09:24",
-		"resolveWith:" : "TravisCI 8/23/2016 10:48",
+		"description" : "merged 10/20/2008 09:23",
 		"seasideAddonsUrl" : "pmm 9/12/2013 15:59",
-		"seasideLGPLUrl" : "pmm 9/12/2013 15:59",
-		"seasideUrl" : "pmm 9/12/2013 15:58",
+		"resolveWith:" : "JohanBrichau 5/26/2017 15:56",
+		"addDependency:" : "merged 10/20/2008 09:33",
 		"url" : "lr 2/10/2010 11:18",
-		"url:" : "lr 2/17/2010 15:18" } }
+		"printOn:" : "merged 10/20/2008 09:24",
+		"addDependenciesTo:" : "lr 9/5/2009 18:35",
+		"url:" : "lr 2/17/2010 15:18",
+		"isMIT" : "lr 10/25/2009 15:19"
+	},
+	"class" : {
+		"greaseCore" : "pmm 9/12/2013 16:00",
+		"grPackages" : "JohanBrichau 12/15/2013 18:27"
+	}
+}
\ No newline at end of file
diff --git a/repository/Grease-Core.package/GRPackage.class/properties.json b/repository/Grease-Core.package/GRPackage.class/properties.json
index cbe1dc62..8801d64b 100644
--- a/repository/Grease-Core.package/GRPackage.class/properties.json
+++ b/repository/Grease-Core.package/GRPackage.class/properties.json
@@ -1,18 +1,17 @@
 {
-	"category" : "Grease-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "pmm 9/14/2013 15:53",
+	"super" : "GRObject",
+	"category" : "Grease-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
 	"instvars" : [
 		"name",
 		"description",
 		"dependencies",
 		"license",
-		"url" ],
+		"url"
+	],
 	"name" : "GRPackage",
-	"pools" : [
-		 ],
-	"super" : "GRObject",
-	"type" : "normal" }
+	"type" : "normal"
+}
\ No newline at end of file