Merge pull request #155 from gcotelli/master

Make Zinc load in newer Pharo images again without running previous code or using Metacello trickery

Author: svenvc

.smalltalk.ston

@@ -1,15 +1,8 @@
 SmalltalkCISpec {
   #loading : [
-    SCIMetacelloLoadSpec {
-      #baseline : 'Zodiac',
-      #repository: 'github://svenvc/zodiac/repository',
-      #ignoreImage : true,
-      #platforms : [ #pharo ]
-    },
     SCIMetacelloLoadSpec {
       #baseline : 'ZincHTTPComponents',
       #directory: 'repository',
-      #ignoreImage : true,
       #platforms : [ #pharo ]
     }
   ]

repository/BaselineOfZincHTTPComponents.package/BaselineOfZincHTTPComponents.class/instance/baseline..st

@@ -1,6 +1,7 @@
 baselines
 baseline: spec
 	<baseline>
+	self unloadBaselineOfZodiac.
 	spec for: #common do: [
 		spec 
 			baseline: 'Zodiac' with: [ spec repository: 'github://svenvc/zodiac:master/repository' ];

repository/BaselineOfZincHTTPComponents.package/BaselineOfZincHTTPComponents.class/instance/projectClass.st

@@ -0,0 +1,4 @@
+baselines
+projectClass
+
+	^ MetacelloCypressBaselineProject

repository/BaselineOfZincHTTPComponents.package/BaselineOfZincHTTPComponents.class/instance/unloadBaselineOfZodiac.st

@@ -0,0 +1,11 @@
+doits
+unloadBaselineOfZodiac
+"Newer Pharo versions includes an erroneous BaselineOfZodiac that breaks Zinc loading.
+So, we remove this baseline to not take precedence over the one that Zinc will load and
+avoiding magic tricks in the dependent projects.
+Side note:
+  In Pharo 7 `MCWorkingCopy>>hasPackageNamed:` returns the class instead of a 
+  boolean 🤦"
+	(((MCWorkingCopy hasPackageNamed: 'BaselineOfZodiac') == true)
+    and: [ MCWorkingCopy respondsTo: #forPackageNamed: ])
+		  ifTrue: [ (MCWorkingCopy forPackageNamed: 'BaselineOfZodiac') unload ]