Merge remote-tracking branch 'seaside/master'

dalehenrich · dalehenrich · commit bfa5fe8606d0 · 2019-06-16T09:42:15.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,8 @@ matrix:
     - smalltalk: Squeak-5.1
  
   include:
+    - smalltalk: Pharo64-8.0
+      env: BUILD_NAME=Pharo64-8.0
     - smalltalk: Pharo64-7.0
       env: BUILD_NAME=Pharo64-7.0
     - smalltalk: Pharo64-6.1
diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st
@@ -59,4 +59,24 @@ baselinePharo: spec
 					with: [ spec requires: #('Grease-Pharo40-Slime') ].
 			spec
 				group: 'Slime' with: #('Grease-Pharo40-Slime');
-				group: 'Slime Tests' with: #('Grease-Tests-Slime') ]
+				group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
+	spec
+		for: #(#'pharo8.x')
+		do: [ spec
+				package: 'Grease-Core'
+					with: [ spec includes: #('Grease-Pharo70-Core') ];
+				package: 'Grease-Tests-Core'
+					with: [ spec
+						requires: #('Grease-Pharo70-Core');
+						includes: #('Grease-Tests-Pharo-Core') ];
+				package: 'Grease-Pharo70-Core'
+					with: [ spec requires: #('Grease-Core') ];
+				package: 'Grease-Tests-Pharo-Core'
+					with: [ spec requires: #('Grease-Tests-Core') ];
+				package: 'Grease-Pharo40-Slime'
+					with: [ spec requires: #('Grease-Core') ];
+				package: 'Grease-Tests-Slime'
+					with: [ spec requires: #('Grease-Pharo40-Slime') ].
+			spec
+				group: 'Slime' with: #('Grease-Pharo40-Slime');
+				group: 'Slime Tests' with: #('Grease-Tests-Slime') ]
diff --git a/repository/Grease-Tests-Pharo-Core.package/GRPackage.extension/class/greaseTestsPharoCore.st b/repository/Grease-Tests-Pharo-Core.package/GRPackage.extension/class/greaseTestsPharoCore.st
@@ -1,9 +1,9 @@
 *Grease-Tests-Pharo-Core
-greaseTestsPharo20Core
+greaseTestsPharoCore
 	^ self new
-		name: 'Grease-Tests-Pharo20-Core';
+		name: 'Grease-Tests-Pharo-Core';
 		description: 'Unit tests for the package Grease-Pharo-Core.';
-		addDependency: 'Grease-Pharo20-Core';
+		addDependency: 'Grease-Pharo-Core';
 		addDependency: 'Grease-Tests-Core';
 		url: #greaseUrl;
 		yourself
