diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,5 +1,8 @@ -*-change-log-*- +1.0.1.2 Chris Dornan 2017-06-05 + * Permit utf8-string-1 (#142) + 1.0.1.1 Chris Dornan 2017-06-04 * regex-pcre not working properly with UTF-8 text (#141) * ZeInternals/SearchReplace (#140) diff --git a/lib/cabal-masters/constraints-incl.cabal b/lib/cabal-masters/constraints-incl.cabal --- a/lib/cabal-masters/constraints-incl.cabal +++ b/lib/cabal-masters/constraints-incl.cabal @@ -29,4 +29,4 @@ %- time-locale-compat == 0.1.* %- transformers >= 0.2.2 && < 0.6 %- unordered-containers == 0.2.* -%- utf8-string == 1.0.* +%- utf8-string >= 1 && < 1.1 diff --git a/lib/mega-regex.cabal b/lib/mega-regex.cabal --- a/lib/mega-regex.cabal +++ b/lib/mega-regex.cabal @@ -1,5 +1,5 @@ Name: regex -Version: 1.0.1.1 +Version: 1.0.1.2 Synopsis: Toolkit for regex-base Description: A regular expression toolkit for regex-base with compile-time checking of RE syntax, data types for @@ -68,7 +68,7 @@ Source-Repository this Type: git Location: https://github.com/iconnect/regex.git - Tag: 1.0.1.1 + Tag: 1.0.1.2 @@ -192,7 +192,7 @@ , time-locale-compat == 0.1.* , transformers >= 0.2.2 && < 0.6 , unordered-containers == 0.2.* - , utf8-string == 1.0.* + , utf8-string >= 1 && < 1.1 Executable re-gen-cabals @@ -211,7 +211,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -241,7 +241,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -271,7 +271,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -300,7 +300,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -329,7 +329,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -355,7 +355,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -381,7 +381,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -415,7 +415,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -449,7 +449,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -478,7 +478,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -507,7 +507,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -534,7 +534,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -561,7 +561,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -582,7 +582,7 @@ , template-haskell >= 2.7 && < 2.12 , text == 1.2.* , unordered-containers == 0.2.* - , utf8-string == 1.0.* + , utf8-string >= 1 && < 1.1 Test-Suite re-tests-test @@ -602,7 +602,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -623,7 +623,7 @@ , template-haskell >= 2.7 && < 2.12 , text == 1.2.* , unordered-containers == 0.2.* - , utf8-string == 1.0.* + , utf8-string >= 1 && < 1.1 @@ -643,7 +643,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , blaze-html >= 0.8.1.0 @@ -676,7 +676,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , blaze-html >= 0.8.1.0 @@ -710,7 +710,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -754,7 +754,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -800,7 +800,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -844,7 +844,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -888,7 +888,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -932,7 +932,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -976,7 +976,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -1020,7 +1020,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -1064,7 +1064,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -1108,7 +1108,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -1153,7 +1153,7 @@ -Werror Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 diff --git a/lib/version.txt b/lib/version.txt --- a/lib/version.txt +++ b/lib/version.txt @@ -1,1 +1,1 @@ -1.0.1.1 +1.0.1.2 diff --git a/regex-examples.cabal b/regex-examples.cabal --- a/regex-examples.cabal +++ b/regex-examples.cabal @@ -1,5 +1,5 @@ Name: regex-examples -Version: 1.0.1.1 +Version: 1.0.1.2 Synopsis: Tutorial, tests and example programs for regex Description: Tutorial, tests and example programs for regex, a Regular Expression Toolkit for regex-base with @@ -68,7 +68,7 @@ Source-Repository this Type: git Location: https://github.com/iconnect/regex.git - Tag: 1.0.1.1 + Tag: 1.0.1.2 Executable re-gen-cabals @@ -87,7 +87,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -117,7 +117,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -147,7 +147,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -176,7 +176,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -205,7 +205,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -231,7 +231,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -257,8 +257,8 @@ -Wwarn Build-depends: - regex == 1.0.1.1 - , regex-with-pcre == 1.0.1.1 + regex == 1.0.1.2 + , regex-with-pcre == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -292,8 +292,8 @@ -Wwarn Build-depends: - regex == 1.0.1.1 - , regex-with-pcre == 1.0.1.1 + regex == 1.0.1.2 + , regex-with-pcre == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -327,7 +327,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -356,7 +356,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -385,7 +385,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -412,7 +412,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , bytestring == 0.10.* @@ -439,8 +439,8 @@ -Wwarn Build-depends: - regex == 1.0.1.1 - , regex-with-pcre == 1.0.1.1 + regex == 1.0.1.2 + , regex-with-pcre == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -461,7 +461,7 @@ , template-haskell >= 2.7 && < 2.12 , text == 1.2.* , unordered-containers == 0.2.* - , utf8-string == 1.0.* + , utf8-string >= 1 && < 1.1 Test-Suite re-tests-test @@ -481,8 +481,8 @@ -Wwarn Build-depends: - regex == 1.0.1.1 - , regex-with-pcre == 1.0.1.1 + regex == 1.0.1.2 + , regex-with-pcre == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -503,7 +503,7 @@ , template-haskell >= 2.7 && < 2.12 , text == 1.2.* , unordered-containers == 0.2.* - , utf8-string == 1.0.* + , utf8-string >= 1 && < 1.1 @@ -523,7 +523,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , blaze-html >= 0.8.1.0 @@ -556,7 +556,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 , blaze-html >= 0.8.1.0 @@ -590,7 +590,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -634,7 +634,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -680,7 +680,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -724,8 +724,8 @@ -Wwarn Build-depends: - regex == 1.0.1.1 - , regex-with-pcre == 1.0.1.1 + regex == 1.0.1.2 + , regex-with-pcre == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -769,8 +769,8 @@ -Wwarn Build-depends: - regex == 1.0.1.1 - , regex-with-pcre == 1.0.1.1 + regex == 1.0.1.2 + , regex-with-pcre == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -814,7 +814,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -858,7 +858,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -902,7 +902,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -946,7 +946,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -990,7 +990,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10 @@ -1035,7 +1035,7 @@ -Wwarn Build-depends: - regex == 1.0.1.1 + regex == 1.0.1.2 , array >= 0.4 && < 0.6 , base >= 4 && < 5 , base-compat >= 0.6 && < 0.10