diff --git a/.travis.yml b/.travis.yml index 066fed94bc..2aebf3bded 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,7 +65,7 @@ before_install: - if [ -n "$STYLISH" ]; then ./stylize.sh; exit $?; fi - if [ -n "$IDRIS2" ]; then - git clone https://github.com/edwinb/Idris2 && + git clone https://github.com/edwinb/Idris2-boot && wget https://github.com/cisco/ChezScheme/archive/v9.5.2.tar.gz && tar xvzf v9.5.2.tar.gz && cd ChezScheme-9.5.2 && @@ -73,9 +73,10 @@ before_install: make -j install && cd .. && cabal v1-update && + travis_wait cabal v1-install --only-dependencies && travis_wait cabal v1-install && cd Idris2 && - make idris2 && make base && make contrib; + travis_wait make idris2 && make base && make contrib; exit $?; fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d347da9ea..9115c35c05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # New since last release + +# New in 1.3.3 + Updated to work with GHC 8.8 and cabal 3.0 ++ Bugfixes and documentation updates # New in 1.3.2 + Documentation added to proof section diff --git a/docs/conf.py b/docs/conf.py index 35563206e4..aeeb5b5ff5 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -61,7 +61,7 @@ # The short X.Y version. version = '1.3' # The full version, including alpha/beta/rc tags. -release = '1.3.2' +release = '1.3.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/listing/idris-prompt-helloworld.txt b/docs/listing/idris-prompt-helloworld.txt index 43f6ba396a..968712fe43 100644 --- a/docs/listing/idris-prompt-helloworld.txt +++ b/docs/listing/idris-prompt-helloworld.txt @@ -1,7 +1,7 @@ $ idris hello.idr ____ __ _ / _/___/ /____(_)____ - / // __ / ___/ / ___/ Version 1.3.2 + / // __ / ___/ / ___/ Version 1.3.3 _/ // /_/ / / / (__ ) https://www.idris-lang.org/ /___/\__,_/_/ /_/____/ Type :? for help diff --git a/docs/listing/idris-prompt-start.txt b/docs/listing/idris-prompt-start.txt index 43cbf530c7..31fa5a6c10 100644 --- a/docs/listing/idris-prompt-start.txt +++ b/docs/listing/idris-prompt-start.txt @@ -1,7 +1,7 @@ $ idris ____ __ _ / _/___/ /____(_)____ - / // __ / ___/ / ___/ Version 1.3.2 + / // __ / ___/ / ___/ Version 1.3.3 _/ // /_/ / / / (__ ) https://www.idris-lang.org/ /___/\__,_/_/ /_/____/ Type :? for help diff --git a/docs/parserLibrary/lexer.rst b/docs/parserLibrary/lexer.rst index f80942c3bc..8041d00ac7 100644 --- a/docs/parserLibrary/lexer.rst +++ b/docs/parserLibrary/lexer.rst @@ -239,7 +239,7 @@ input string as parameters: idris -p contrib parserEx.idr ____ __ _ / _/___/ /____(_)____ - / // __ / ___/ / ___/ Version 1.3.2 + / // __ / ___/ / ___/ Version 1.3.3 _/ // /_/ / / / (__ ) http://www.idris-lang.org/ /___/\__,_/_/ /_/____/ Type :? for help diff --git a/idris.cabal b/idris.cabal index b6cdabb956..dbac5160fa 100644 --- a/idris.cabal +++ b/idris.cabal @@ -1,10 +1,10 @@ Cabal-Version: 2.4 Name: idris -Version: 1.3.2 +Version: 1.3.3 License: BSD-3-Clause License-file: LICENSE Author: Edwin Brady -Maintainer: Edwin Brady +Maintainer: Niklas Larsson Homepage: https://www.idris-lang.org/ Bug-reports: https://github.com/idris-lang/Idris-dev/issues @@ -44,7 +44,7 @@ Description: Idris is a general purpose language with full dependent types. Build-type: Custom -Tested-With: GHC == 7.10.3, GHC == 8.0.1 +Tested-With: GHC == 8.6.5, GHC == 8.8.4 -- NOTE: due to https://github.com/haskell/cabal/issues/6125 the use of ** is -- heavily discouraged. diff --git a/man/idris.1 b/man/idris.1 index 55f63566bf..734cc21c68 100644 --- a/man/idris.1 +++ b/man/idris.1 @@ -1,6 +1,6 @@ .\" Manpage for Idris. .\" Contact <> to correct errors or typos. -.TH man 1 "23 October 2018" "1.3.2" "Idris man page" +.TH man 1 "23 May 2020" "1.3.3" "Idris man page" .SH NAME idris -\ a general purpose pure functional programming language with dependent types. .SH SYNOPSIS