Fix gradle scripts to ensure model checker is run after everything else has heen built.

build.gradle

@@ -144,10 +144,13 @@ ant.properties.'ci.build.num' = "${tagMatcher().find() ? tagMatcher()[0][2] : '9
 task check {
   dependsOn {
     [
-      ':coderules-test',
-      ':samples/mpscore:mpscore-test',
-      ':samples/lambdacalc:lambdacalc-test',
-      ':samples/fitch:fitch-test'
+      ':samples/mpscore:mpscore-check',
+      ':samples/lambdacalc:lambdacalc-check',
+      ':samples/fitch:fitch-check'
     ]
   }
+  // tests from this target also include model checker invocation, which requires everything to be built
+  finalizedBy {
+    ':coderules-check'
+  }
 }

samples/fitch/build.gradle

@@ -28,8 +28,20 @@ ant.importBuild('build.xml') {antTarget ->
   }
 }
 
+'fitch-declare-mps-tasks' {
+  dependsOn {
+    ':init'
+  }
+}
+
 'fitch-generate' {
   dependsOn {
     ':coderules-assemble'
   }
 }
+
+task check {
+  dependsOn {
+    'fitch-check'
+  }
+}

samples/lambdacalc/build.gradle

@@ -28,8 +28,20 @@ ant.importBuild('build.xml') {antTarget ->
   }
 }
 
+'lambdacalc-declare-mps-tasks' {
+  dependsOn {
+    ':init'
+  }
+}
+
 'lambdacalc-generate' {
   dependsOn {
     ':coderules-assemble'
   }
 }
+
+task check {
+  dependsOn {
+    'lambdacalc-check'
+  }
+}

samples/mpscore/build.gradle

@@ -28,8 +28,20 @@ ant.importBuild('build.xml') {antTarget ->
   }
 }
 
+'mpscore-declare-mps-tasks' {
+  dependsOn {
+    ':init'
+  }
+}
+
 'mpscore-generate' {
   dependsOn {
     ':coderules-assemble'
   }
 }
+
+task check {
+  dependsOn {
+    'mpscore-check'
+  }
+}