Bump to LTS 4.0

ljli · Jan 6, 2016 · c4dc4c7 · c4dc4c7
1 parent df40565
commit c4dc4c7
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 20 deletions.
diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs
@@ -154,7 +154,7 @@ rules global@Global{..} args = do
                     ["--local-bin-path=" ++ tmpDir]
             () <- cmd0 $ concat $ concat
                 [["install --pedantic --no-haddock-deps"], [" --haddock" | gTestHaddocks]]
-            () <- cmd0 "install --resolver=lts-3.0 cabal-install"
+            () <- cmd0 "install --resolver=lts-4.0 cabal-install"
             let cmd' = cmd (AddPath [tmpDir] []) stackProgName (stackArgs global)
             () <- cmd' "test --pedantic --flag stack:integration-tests"
             return ()

diff --git a/etc/scripts/stack.yaml b/etc/scripts/stack.yaml
@@ -1 +1 @@
-resolver: lts-3.16
+resolver: lts-4.0
diff --git a/stack.cabal b/stack.cabal
@@ -171,7 +171,7 @@ library
                    , monad-loops >= 0.4.2.1
                    , mtl >= 2.1.3.1
                    , old-locale >= 1.0.0.6
-                   , optparse-applicative < 0.13
+                   , optparse-applicative >= 0.11 && < 0.13
                    , path >= 0.5.1
                    , persistent >= 2.1.2
                    , persistent-sqlite >= 2.1.4
@@ -289,7 +289,7 @@ test-suite stack-test
                 , resourcet
                 , Cabal
                 , text
-                , optparse-applicative < 0.13
+                , optparse-applicative >= 0.11 && < 0.13
                 , bytestring
                 , QuickCheck
                 , retry >= 0.6 && < 0.8

diff --git a/stack.yaml b/stack.yaml
@@ -1,10 +1,9 @@
-resolver: lts-3.19
+resolver: lts-4.0
 image:
   containers:
     - base: "fpco/ubuntu-with-libgmp:14.04"
       entrypoints:
         - stack
-
 nix:
   # --nix on the command-line to enable.
   enable: false

diff --git a/test/integration/lib/StackTest.hs b/test/integration/lib/StackTest.hs
@@ -126,4 +126,4 @@ isWindows = os == "mingw32"
 -- version is released, pass this argument to @stack@ when running in
 -- a global context.  The LTS major version here should match that of
 -- the main @stack.yaml@.
-defaultResolverArg = "--resolver=lts-3"
+defaultResolverArg = "--resolver=lts-4"
diff --git a/test/integration/tests/1337-unicode-everywhere/files/stack.yaml b/test/integration/tests/1337-unicode-everywhere/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-3.16
+resolver: lts-4.0
 packages:
 - '.'
 extra-deps: []

diff --git a/test/integration/tests/32-unlisted-module/files/stack.yaml b/test/integration/tests/32-unlisted-module/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-3.0
+resolver: lts-4.0
diff --git a/test/integration/tests/335-multi-package-flags/files/stack.yaml b/test/integration/tests/335-multi-package-flags/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-3.0
+resolver: lts-4.0
diff --git a/test/integration/tests/345-override-bytestring/files/stack.yaml b/test/integration/tests/345-override-bytestring/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-3.0
+resolver: lts-4.0
 extra-deps:
 - bytestring-0.10.6.0
 packages:

diff --git a/test/integration/tests/365-invalid-success/files/stack.yaml b/test/integration/tests/365-invalid-success/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-3.0
+resolver: lts-4.0
diff --git a/test/integration/tests/366-non-root-dir/files/stack.yaml b/test/integration/tests/366-non-root-dir/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-3.0
+resolver: lts-4.0
diff --git a/test/integration/tests/397-case-insensitive-flags/files/stack.yaml b/test/integration/tests/397-case-insensitive-flags/files/stack.yaml
@@ -1 +1 @@
-resolver: lts-3.0
+resolver: lts-4.0
diff --git a/test/integration/tests/606-local-version-not-exist/files/stack.yaml b/test/integration/tests/606-local-version-not-exist/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-3.0
+resolver: lts-4.0
diff --git a/test/integration/tests/763-buildable-false/files/stack.yaml b/test/integration/tests/763-buildable-false/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-3.0
+resolver: lts-4.0
diff --git a/test/integration/tests/cyclic-test-deps/Main.hs b/test/integration/tests/cyclic-test-deps/Main.hs
@@ -3,5 +3,5 @@ import StackTest
 main :: IO ()
 main = do
     stack ["unpack", "text-1.2.1.1"]
-    stack ["init", "--resolver", "lts-3.0"]
+    stack ["init", defaultResolverArg]
     stack ["test", "--dry-run"]
diff --git a/test/integration/tests/duplicate-package-ids/files/stack1.yaml b/test/integration/tests/duplicate-package-ids/files/stack1.yaml
@@ -1,2 +1,2 @@
-resolver: lts-3.0
+resolver: lts-4.0
 packages: []
diff --git a/test/integration/tests/duplicate-package-ids/files/stack2.yaml b/test/integration/tests/duplicate-package-ids/files/stack2.yaml
@@ -1,3 +1,3 @@
-resolver: lts-3.0
+resolver: lts-4.0
 packages:
 - auto-update-0.1.2.1
diff --git a/test/integration/tests/multi-test/files/stack.yaml b/test/integration/tests/multi-test/files/stack.yaml
@@ -4,4 +4,4 @@ packages:
 - sub-package
 - cyclic
 extra-deps: []
-resolver: lts-3.9
+resolver: lts-4.0