drop support for Coq 8.6; use the ssreflect that ships with Coq

.gitlab-ci.yml

@@ -29,13 +29,13 @@ variables:
 build-coq.dev:
   <<: *template
   variables:
-    OPAM_PINS: "coq version dev   coq-mathcomp-ssreflect version dev"
+    OPAM_PINS: "coq version dev"
     VALIDATE: "1"
 
 build-coq.8.7.2:
   <<: *template
   variables:
-    OPAM_PINS: "coq version 8.7.2   coq-mathcomp-ssreflect version 1.6.4"
+    OPAM_PINS: "coq version 8.7.2"
     OPAM_PKG: "coq-iris"
     TIMING_PROJECT: "iris"
     TIMING_CONF: "coq-8.7.2"
@@ -45,22 +45,17 @@ build-coq.8.7.2:
 build-coq.8.7.1:
   <<: *template
   variables:
-    OPAM_PINS: "coq version 8.7.1   coq-mathcomp-ssreflect version 1.6.4"
+    OPAM_PINS: "coq version 8.7.1"
 
 build-coq.8.7.0:
   <<: *template
   variables:
-    OPAM_PINS: "coq version 8.7.0   coq-mathcomp-ssreflect version 1.6.4"
-
-build-coq.8.6.1:
-  <<: *template
-  variables:
-    OPAM_PINS: "coq version 8.6.1   coq-mathcomp-ssreflect version 1.6.4"
+    OPAM_PINS: "coq version 8.7.0"
 
 build-stdpp.dev:
   <<: *template
   variables:
-    OPAM_PINS: "coq version 8.7.2   coq-mathcomp-ssreflect version 1.6.4   coq-stdpp.dev git https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp/#$STDPP_REV"
+    OPAM_PINS: "coq version 8.7.2   coq-stdpp.dev git https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp/#$STDPP_REV"
   except:
   only:
   - triggers

README.md

@@ -6,10 +6,11 @@ This is the Coq development of the [Iris Project](http://iris-project.org).
 
 This version is known to compile with:
 
- - Coq 8.6.1 / 8.7.0 / 8.7.1 / 8.7.2
- - Ssreflect 1.6.4
+ - Coq 8.7.0 / 8.7.1 / 8.7.2
  - A development version of [std++](https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp)
 
+For a version compatible with Coq 8.6, have a look at the
+[iris-3.1 branch](https://gitlab.mpi-sws.org/FP/iris-coq/tree/iris-3.1).
 If you need to work with Coq 8.5, please check out the
 [iris-3.0 branch](https://gitlab.mpi-sws.org/FP/iris-coq/tree/iris-3.0).
 

opam

@@ -10,7 +10,6 @@ build: [make "-j%{jobs}%"]
 install: [make "install"]
 remove: ["rm" "-rf" "%{lib}%/coq/user-contrib/iris"]
 depends: [
-  "coq" { (>= "8.6.1" & < "8.8~") | (= "dev") }
-  "coq-mathcomp-ssreflect" { (>= "1.6.1" & < "1.7~") | (= "dev") }
+  "coq" { (>= "8.7.0" & < "8.8~") | (= "dev") }
   "coq-stdpp" { (= "dev.2018-04-11.0") | (= "dev") }
 ]

theories/algebra/base.v

-From mathcomp Require Export ssreflect.
+From Coq.ssr Require Export ssreflect.
 From stdpp Require Export prelude.
 Set Default Proof Using "Type".
-(* Reset options set by the ssreflect plugin to their defaults *)
-Global Set Bullet Behavior "Strict Subproofs".
 Global Open Scope general_if_scope.
-Global Unset Asymmetric Patterns.
+Global Set SsrOldRewriteGoalsOrder. (* See Coq issue #5706 *)
 Ltac done := stdpp.tactics.done.