Clean cabal project (#2097)

* Remove superflous things * Set index-state * Add ghc-api-compat and remove shake-bench * Correct comment about ghc-api-compat * Add specific project file for benchs * Use specific project file for benchmarks * Ensure we use lsp-1.3.0.1 * Use lsp-types-1.3.0.1 for stack * Use lsp-types-1.3.0.1 for default stack * Remove some more allow-newer * Use one cabal.project Co-authored-by: Pepe Iborra <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit 57ffd74) # Conflicts: # cabal.project
haskell · Aug 18, 2021 · 8002d25 · 8002d25
1 parent ee37c51
commit 8002d25
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 14 deletions.
diff --git a/cabal.project b/cabal.project
@@ -23,29 +23,33 @@ packages:
          ./plugins/hls-module-name-plugin
          ./plugins/hls-ormolu-plugin
          ./plugins/hls-call-hierarchy-plugin
+
 tests: true
 
 package *
   ghc-options: -haddock
   test-show-details: direct
 
--- ghc-api-compat-8.6
+-- see https://gitlab.haskell.org/haskell/ghc-api-compat/-/issues/1#note_371055
 source-repository-package
   type: git
   location: https://github.com/hsyl20/ghc-api-compat
   tag: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
 
 write-ghc-environment-files: never
 
+<<<<<<< HEAD
 index-state: 2021-08-01T00:00:00Z
+=======
+index-state: 2021-08-12T12:00:38Z
+>>>>>>> 57ffd744 (Clean cabal project (#2097))
 
 constraints:
-    -- Diagrams doesn't support optparse-applicative >= 0.16 yet
-    optparse-applicative < 0.16,
     hyphenation +embed
 
 
 allow-newer:
+<<<<<<< HEAD
     active:base,
     assoc:base,
     cryptohash-md5:base,
@@ -85,3 +89,8 @@ allow-newer:
     these:base,
     time-compat:base
 
+=======
+    -- for shake-bench
+    Chart-diagrams:diagrams-core,
+    SVGFonts:diagrams-core
+>>>>>>> 57ffd744 (Clean cabal project (#2097))
diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal
@@ -61,7 +61,7 @@ library
         hls-plugin-api ^>= 1.2.0.0,
         lens,
         hiedb == 0.4.0.*,
-        lsp-types >= 1.2 && < 1.4,
+        lsp-types >= 1.3.0.1 && < 1.4,
         lsp == 1.2.*,
         mtl,
         network-uri,

diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml
@@ -66,7 +66,7 @@ extra-deps:
   - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
   - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
   - lsp-1.2.0.1
-  - lsp-types-1.3.0.0
+  - lsp-types-1.3.0.1
   - lsp-test-0.14.0.1
 
 configure-options:

diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml
@@ -66,7 +66,7 @@ extra-deps:
   - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
   - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
   - lsp-1.2.0.1
-  - lsp-types-1.3.0.0
+  - lsp-types-1.3.0.1
   - lsp-test-0.14.0.1
 
 configure-options:

diff --git a/stack-8.10.4.yaml b/stack-8.10.4.yaml
@@ -62,7 +62,7 @@ extra-deps:
   - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
   - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
   - lsp-1.2.0.1
-  - lsp-types-1.3.0.0
+  - lsp-types-1.3.0.1
   - lsp-test-0.14.0.1
 
   # Enable these when supported by all formatters

diff --git a/stack-8.10.5.yaml b/stack-8.10.5.yaml
@@ -64,7 +64,7 @@ extra-deps:
   - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
   - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
   - lsp-1.2.0.1
-  - lsp-types-1.3.0.0
+  - lsp-types-1.3.0.1
   - lsp-test-0.14.0.1
 
   # Enable these when supported by all formatters

diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml
@@ -103,7 +103,7 @@ extra-deps:
   - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
   - resourcet-1.2.3
   - lsp-1.2.0.1
-  - lsp-types-1.3.0.0
+  - lsp-types-1.3.0.1
   - lsp-test-0.14.0.1
 
 flags:

diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
@@ -104,7 +104,7 @@ extra-deps:
   - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
   - resourcet-1.2.3
   - lsp-1.2.0.1
-  - lsp-types-1.3.0.0
+  - lsp-types-1.3.0.1
   - lsp-test-0.14.0.1
 
 configure-options:

diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml
@@ -83,7 +83,7 @@ extra-deps:
   - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
   - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
   - lsp-1.2.0.1
-  - lsp-types-1.3.0.0
+  - lsp-types-1.3.0.1
   - lsp-test-0.14.0.1
 
 configure-options:

diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml
@@ -80,7 +80,7 @@ extra-deps:
   - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
   - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
   - lsp-1.2.0.1
-  - lsp-types-1.3.0.0
+  - lsp-types-1.3.0.1
   - lsp-test-0.14.0.1
 
 configure-options:

diff --git a/stack-9.0.1.yaml b/stack-9.0.1.yaml
@@ -55,7 +55,7 @@ extra-deps:
 - retrie-1.0.0.0
 - some-1.0.2@sha256:3d460998df32ad7b93bf55657aeae988d97070155e71718b4bc75d0997ce9d62,2244
 - lsp-1.2.0.1
-- lsp-types-1.3.0.0
+- lsp-types-1.3.0.1
 - lsp-test-0.14.0.1
 
 # Upstream patches for ghc-9.0.1 compatability

diff --git a/stack.yaml b/stack.yaml
@@ -59,7 +59,7 @@ extra-deps:
   - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
   - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
   - lsp-1.2.0.1
-  - lsp-types-1.3.0.0
+  - lsp-types-1.3.0.1
   - lsp-test-0.14.0.1
 
 configure-options: