casa-abbreviations-and-acronyms 0.0.8 → 0.0.10

raw patch · 5 files changed

+47/−33 lines, 5 filesdep +semialigndep ~basedep ~bytestringdep ~containersPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependencies added: semialign

Dependency ranges changed: base, bytestring, containers, fuzzy, lens, monoid-subclasses, optparse-applicative, these

API changes (from Hackage documentation)

Files

• LICENCE +2/−2
• casa-abbreviations-and-acronyms.cabal +38/−28
• changelog.md +4/−0
• src/library/Data/Aviation/Casa/AbbreviationsAndAcronyms/Acronym.hs +1/−1
• src/library/Data/Aviation/Casa/AbbreviationsAndAcronyms/Render.hs +2/−2

@@ -1,5 +1,5 @@-Copyright (c) 2018, Commonwealth Scientific and Industrial Research Organisation-(CSIRO) ABN 41 687 119 230.+Copyright (c) 2018-2019, Commonwealth Scientific and Industrial Research Organisation (CSIRO) ABN 41 687 119 230.+Copyright (c) 2020-2021, Tony Morris  All rights reserved. 

@@ -1,10 +1,10 @@ -- documentation, see http://haskell.org/cabal/users-guide/  name:                  casa-abbreviations-and-acronyms-version:               0.0.8+version:               0.0.10 synopsis:              CASA Abbreviations and Acronyms-description:       -  <<https://raw.githubusercontent.com/qfpl/assets/master/data61-transparent-bg.png>>+description:+  <<https://system-f.gitlab.io/logo/systemf-450x450.jpg>>   .   CASA Abbreviations and Acronyms   .@@ -13,7 +13,8 @@ license-file:          LICENCE author:                Queensland Functional Programming Lab <oᴉ˙ldɟb@llǝʞsɐɥ> maintainer:            Queensland Functional Programming Lab <oᴉ˙ldɟb@llǝʞsɐɥ>-copyright:             Copyright (C) 2018 Commonwealth Scientific and Industrial Research Organisation (CSIRO)+copyright:             Copyright (C) 2018-2019 Commonwealth Scientific and Industrial Research Organisation (CSIRO)+                       Copyright (C) 2020-2021 Tony Morris category:              Aviation build-type:            Simple extra-source-files:    changelog.md@@ -34,15 +35,15 @@                        , Data.Aviation.Casa.AbbreviationsAndAcronyms.Render.Score                        , Data.Aviation.Casa.AbbreviationsAndAcronyms.Render.Spacing                        , Data.Aviation.Casa.AbbreviationsAndAcronyms.Search-                       +   build-depends:         base              >= 4.8     && < 5-                       , lens              >= 4.15    && < 4.19+                       , lens              >= 4.15    && < 4.20 || >= 5.0 && < 5.1                        , containers        >= 0.5     && < 0.7                        , fuzzy             >= 0.1.0.0 && < 0.2-                       , monoid-subclasses >= 0.4     && < 0.5-                       , wreq              >= 0.5     && < 0.6-                       , bytestring        >= 0.10    && < 0.11-                       , these             >= 0.7.4   && < 0.8+                       , monoid-subclasses >= 1.1     && < 1.2+                       , bytestring        >= 0.10    && < 0.12+                       , semialign         >= 1       && < 1.3+                       , these             >= 1.1     && < 1.2                        , profunctors       >= 5.0     && < 6.0    hs-source-dirs:      src/library@@ -51,18 +52,22 @@    ghc-options:         -Wall -executable pre-process-casa-abbreviations-and-acronyms                       -  build-depends:         base              >= 4.8     && < 5-                       , wreq              >= 0.5     && < 0.6-                       , lens              >= 4.15    && < 4.19-                       , containers        >= 0.5     && < 0.7-                       , fuzzy             >= 0.1.0.0 && < 0.2-                       , monoid-subclasses >= 0.4     && < 0.5-                       , wreq              >= 0.5     && < 0.6-                       , bytestring        >= 0.10    && < 0.11+executable pre-process-casa-abbreviations-and-acronyms+  if impl(ghcjs)+    buildable: False+  else+    buildable: True +    build-depends:         base+                         , lens+                         , containers+                         , fuzzy+                         , monoid-subclasses+                         , wreq              >= 0.5     && < 0.6+                         , bytestring+   main-is:             Main.hs-                       +   hs-source-dirs:      src/pre-process    default-language:    Haskell2010@@ -70,16 +75,21 @@   ghc-options:         -Wall  executable casa-abbreviations-and-acronyms-  default-language:    Haskell2010+  if impl(ghcjs)+    buildable: False+  else+    buildable: True -  hs-source-dirs:      src/executable+    build-depends:        base+                        , lens+                        , fuzzy+                        , optparse-applicative >= 0.13.2  && < 0.17+                        , casa-abbreviations-and-acronyms    main-is:             Main.hs -  build-depends:        base                 >= 4.8     && < 5-                      , lens                 >= 4.15    && < 4.19-                      , fuzzy                >= 0.1.0.0 && < 0.2-                      , optparse-applicative >= 0.13.2  && < 0.15-                      , casa-abbreviations-and-acronyms-                    +  hs-source-dirs:      src/executable++  default-language:    Haskell2010+   ghc-options:         -Wall

@@ -1,3 +1,7 @@+0.0.9++* Update dependencies+ 0.0.8  * Use VERSION macro to print version.

@@ -348,7 +348,7 @@       "AIS"   , Acronym       "AFRU"-      "Aerodrome Frequency Response Unit (also known as a "beepback" unit)"+      "Aerodrome Frequency Response Unit (also known as a \"beepback\" unit)"       "AIS"   , Acronym       "AFS"

@@ -12,7 +12,7 @@ import Control.Category((.)) import Control.Lens((^.), transform) import Control.Monad((>>=))-import Data.Align(Align(alignWith))+import Data.Align(Semialign(alignWith)) import Data.Aviation.Casa.AbbreviationsAndAcronyms.Acronym import Data.Aviation.Casa.AbbreviationsAndAcronyms.Render.Config(ConfigReader, readHeadingSeparatorColours, readSeparatorSpacing, readHeadingNameColours, readNameSpacing, readHeadingMeaningColours, readMeaningSpacing, readHeadingSourceColours, readSourceSpacing, readHeadingScoreColours, readScoreSpacing, readAcronymSeparatorColours, readAcronymNameColours, readAcronymMeaningColours, readAcronymSourceColours, readAcronymScoreColours) import Data.Aviation.Casa.AbbreviationsAndAcronyms.Render.Score(HasShowScore(showScore))@@ -83,7 +83,7 @@               score'' =                 spacesplit shr score'               alignWidth ::-                Align f =>+                Semialign f =>                 (String -> String -> a)                 -> f String                 -> f String