added new versions of ghc-api-compat

pepeiborra · pepeiborra · commit ff9508adc90c · 2021-09-06T16:23:50.000+02:00
diff --git a/cabal-ghc901.project b/cabal-ghc901.project
@@ -66,7 +66,7 @@ source-repository-package
 
 write-ghc-environment-files: never
 
-index-state: 2021-08-30T20:52:40Z
+index-state: 2021-09-06T12:12:22Z
 
 constraints:
     -- These plugins doesn't work on GHC9 yet
diff --git a/cabal.project b/cabal.project
@@ -33,15 +33,12 @@ package *
 
 write-ghc-environment-files: never
 
-index-state: 2021-08-30T20:52:40Z
+index-state: 2021-09-06T12:12:22Z
 
 constraints:
     hyphenation +embed
 
-
 allow-newer:
-    -- for ghc 8.10.7
-    ghc-api-compat:ghc,
     -- for shake-bench
     Chart-diagrams:diagrams-core,
     SVGFonts:diagrams-core
diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal
@@ -116,12 +116,15 @@ library
     elif impl(ghc == 8.10.5)
         build-depends:
             ghc-api-compat ==8.10.5
-    elif impl(ghc > 8.10.5) && impl(ghc < 9)
+    elif impl(ghc == 8.10.6)
         build-depends:
             ghc-api-compat ==8.10.6
-    else
+    elif impl(ghc == 8.10.7)
+        build-depends:
+            ghc-api-compat ==8.10.7
+    elif impl(ghc == 9.0.1)
         build-depends:
-            ghc-api-compat
+            ghc-api-compat ==9.0.1
 
     default-extensions:
         ApplicativeDo
diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
@@ -366,12 +366,15 @@ executable haskell-language-server
   elif impl(ghc == 8.10.5)
     build-depends:
       ghc-api-compat ==8.10.5
-  elif impl(ghc > 8.10.5) && impl(ghc < 9)
+  elif impl(ghc == 8.10.6)
     build-depends:
       ghc-api-compat ==8.10.6
-  else
+  elif impl(ghc == 8.10.7)
     build-depends:
-      ghc-api-compat
+      ghc-api-compat ==8.10.7
+  elif impl(ghc == 9.0.1)
+    build-depends:
+      ghc-api-compat ==9.0.1
 
   default-language: Haskell2010
   default-extensions: DataKinds, TypeOperators
diff --git a/hls-plugin-api/hls-plugin-api.cabal b/hls-plugin-api/hls-plugin-api.cabal
@@ -62,12 +62,15 @@ library
   elif impl(ghc == 8.10.5)
     build-depends:
       ghc-api-compat ==8.10.5
-  elif impl(ghc > 8.10.5) && impl(ghc < 9)
+  elif impl(ghc == 8.10.6)
     build-depends:
       ghc-api-compat ==8.10.6
-  else
+  elif impl(ghc == 8.10.7)
+    build-depends:
+      ghc-api-compat ==8.10.7
+  elif impl(ghc == 9.0.1)
     build-depends:
-      ghc-api-compat
+      ghc-api-compat ==9.0.1
 
   if os(windows)
     build-depends: Win32
diff --git a/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal b/plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal
@@ -45,12 +45,15 @@ library
   elif impl(ghc == 8.10.5)
     build-depends:
       ghc-api-compat ==8.10.5
-  elif impl(ghc > 8.10.5) && impl(ghc < 9)
+  elif impl(ghc == 8.10.6)
     build-depends:
       ghc-api-compat ==8.10.6
-  else
+  elif impl(ghc == 8.10.7)
     build-depends:
-      ghc-api-compat
+      ghc-api-compat ==8.10.7
+  elif impl(ghc == 9.0.1)
+    build-depends:
+      ghc-api-compat ==9.0.1
 
 test-suite tests
   type:             exitcode-stdio-1.0
diff --git a/plugins/hls-class-plugin/hls-class-plugin.cabal b/plugins/hls-class-plugin/hls-class-plugin.cabal
@@ -42,12 +42,15 @@ library
   elif impl(ghc == 8.10.5)
     build-depends:
       ghc-api-compat ==8.10.5
-  elif impl(ghc > 8.10.5) && impl(ghc < 9)
+  elif impl(ghc == 8.10.6)
     build-depends:
       ghc-api-compat ==8.10.6
-  else
+  elif impl(ghc == 8.10.7)
     build-depends:
-      ghc-api-compat
+      ghc-api-compat ==8.10.7
+  elif impl(ghc == 9.0.1)
+    build-depends:
+      ghc-api-compat ==9.0.1
 
   default-language:   Haskell2010
   default-extensions:
diff --git a/plugins/hls-eval-plugin/hls-eval-plugin.cabal b/plugins/hls-eval-plugin/hls-eval-plugin.cabal
@@ -81,19 +81,22 @@ library
     , transformers
     , unliftio
     , unordered-containers
-    
+
   if impl(ghc < 8.10.5)
     build-depends:
       ghc-api-compat ==8.6
   elif impl(ghc == 8.10.5)
     build-depends:
       ghc-api-compat ==8.10.5
-  elif impl(ghc > 8.10.5) && impl(ghc < 9)
+  elif impl(ghc == 8.10.6)
     build-depends:
       ghc-api-compat ==8.10.6
-  else
+  elif impl(ghc == 8.10.7)
+    build-depends:
+      ghc-api-compat ==8.10.7
+  elif impl(ghc == 9.0.1)
     build-depends:
-      ghc-api-compat
+      ghc-api-compat ==9.0.1
 
   ghc-options:
     -Wall -Wno-name-shadowing -Wno-unticked-promoted-constructors
diff --git a/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal b/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal
@@ -32,12 +32,15 @@ library
   elif impl(ghc == 8.10.5)
     build-depends:
       ghc-api-compat ==8.10.5
-  elif impl(ghc > 8.10.5) && impl(ghc < 9)
+  elif impl(ghc == 8.10.6)
     build-depends:
       ghc-api-compat ==8.10.6
-  else
+  elif impl(ghc == 8.10.7)
     build-depends:
-      ghc-api-compat
+      ghc-api-compat ==8.10.7
+  elif impl(ghc == 9.0.1)
+    build-depends:
+      ghc-api-compat ==9.0.1
 
   default-language:   Haskell2010
   default-extensions:
diff --git a/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal b/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal
@@ -39,12 +39,15 @@ library
   elif impl(ghc == 8.10.5)
     build-depends:
       ghc-api-compat ==8.10.5
-  elif impl(ghc > 8.10.5) && impl(ghc < 9)
+  elif impl(ghc == 8.10.6)
     build-depends:
       ghc-api-compat ==8.10.6
-  else
+  elif impl(ghc == 8.10.7)
     build-depends:
-      ghc-api-compat
+      ghc-api-compat ==8.10.7
+  elif impl(ghc == 9.0.1)
+    build-depends:
+      ghc-api-compat ==9.0.1
 
 test-suite tests
   type:             exitcode-stdio-1.0
diff --git a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal
@@ -38,12 +38,15 @@ library
   elif impl(ghc == 8.10.5)
     build-depends:
       ghc-api-compat ==8.10.5
-  elif impl(ghc > 8.10.5) && impl(ghc < 9)
+  elif impl(ghc == 8.10.6)
     build-depends:
       ghc-api-compat ==8.10.6
-  else
+  elif impl(ghc == 8.10.7)
     build-depends:
-      ghc-api-compat
+      ghc-api-compat ==8.10.7
+  elif impl(ghc == 9.0.1)
+    build-depends:
+      ghc-api-compat ==9.0.1
 
   default-language:   Haskell2010
   default-extensions:
diff --git a/stack-8.10.7.yaml b/stack-8.10.7.yaml
@@ -35,7 +35,7 @@ extra-deps:
   - bytestring-encoding-0.1.1.0@sha256:1c3b97eb6345fd7153006211c8272215cd78bb0cf440c41185290822f1e3f2c2,1738
   - data-tree-print-0.1.0.2@sha256:d845e99f322df70e0c06d6743bf80336f5918d5423498528beb0593a2afc1703,1620
   - floskell-0.10.5@sha256:77f0bc1569573d9666b10975a5357fef631d32266c071733739393ccae521dab,3803
-  - ghc-api-compat-8.10.6@sha256:cde370b1b4c8a090de1ba6a8e27f65def9af43ca88710b412a6545b876568626,3324
+  - ghc-api-compat-8.10.7
   - heapsize-0.3.0.1@sha256:0b69aa97a46d819b700ac7b145f3b5493c3565cf2c5b8298682238d405d0326e,1417
   - hiedb-0.4.0.0@sha256:b6dadd5cefc8c1052bc4b29144f616ca9c22e863a96d8e447d66a4d32c96fd4a,2987
   - implicit-hie-0.1.2.6@sha256:f50a908979a574a881f753c0f9a5224f023f438b30fdefc5b7fa01803b07a280,2998
@@ -55,9 +55,6 @@ extra-deps:
   # - ghc-lib-parser-ex-9.0.0.4@sha256:8282b11c3797fc8ba225b245e736cc9a0745d9c48d0f9fea7f9bffb5c9997709,3642
   # - hlint-3.3@sha256:4218ad6e03050f5d68aeba0e025f5f05e366c8fd49657f2a19df04ee31b2bb23,4154
 
-# for ghc-api-compat-8.10.6
-allow-newer: true
-
 configure-options:
   ghcide:
       - --disable-library-for-ghci
diff --git a/stack-9.0.1.yaml b/stack-9.0.1.yaml
@@ -37,6 +37,7 @@ extra-deps:
 - dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657
 - dependent-sum-0.7.1.0@sha256:0e419237f5b86da3659772afff9cab355c0f8d5b3fdb15a5b30e673d8dc83941,2147
 - floskell-0.10.5
+- ghc-api-compat-9.0.1
 - ghc-source-gen-0.4.1.0
 - heapsize-0.3.0.1@sha256:0b69aa97a46d819b700ac7b145f3b5493c3565cf2c5b8298682238d405d0326e,1417
 - hie-bios-0.7.6
@@ -59,9 +60,6 @@ extra-deps:
   commit: b6245884ae83e00dd2b5261762549b37390179f8
 # https://github.com/lspitzner/czipwith/pull/2
 
-- github: hsyl20/ghc-api-compat
-  commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
-
 - github: anka-213/th-extras
   commit: 57a97b4df128eb7b360e8ab9c5759392de8d1659
 # https://github.com/mokus0/th-extras/pull/8
