diff --git a/.github/workflows/repo-ghc-8.6-cabal-2.4-ros.yml b/.github/workflows/repo-ghc-8.6-cabal-2.4-ros.yml index be899c4..4b2a072 100644 --- a/.github/workflows/repo-ghc-8.6-cabal-2.4-ros.yml +++ b/.github/workflows/repo-ghc-8.6-cabal-2.4-ros.yml @@ -43,7 +43,7 @@ jobs: - name: Install ogma run: | - cabal v1-install copilot ogma-**/ --constraint="copilot >= 3.19.1" + cabal v1-install copilot ogma-**/ --constraint="copilot >= 3.19.1" --constraint="aeson >= 2.0.3.0" - name: Generate ROS app run: | diff --git a/.github/workflows/repo-ghc-8.6-cabal-2.4.yml b/.github/workflows/repo-ghc-8.6-cabal-2.4.yml index 4eaa7bb..71fade8 100644 --- a/.github/workflows/repo-ghc-8.6-cabal-2.4.yml +++ b/.github/workflows/repo-ghc-8.6-cabal-2.4.yml @@ -53,11 +53,10 @@ jobs: # the dependencies do not change and cabal does not change the # installation plan (which would mean we'd be running the tests with a # version of ogma compiled with different dependencies). - cabal v1-install ogma-**/ --enable-tests - + cabal v1-install ogma-**/ --enable-tests --constraint="aeson >= 2.0.3.0" - name: Test all packages run: | # We want to document the build process, and get detailed information # if there is a problem (or if all goes well). We therefore execute the # installation with -j1. - cabal v1-install ogma-**/ --enable-tests --run-tests -j1 + cabal v1-install ogma-**/ --enable-tests --run-tests -j1 --constraint="aeson >= 2.0.3.0" diff --git a/ogma-cli/CHANGELOG.md b/ogma-cli/CHANGELOG.md index d0b405d..00e5d43 100644 --- a/ogma-cli/CHANGELOG.md +++ b/ogma-cli/CHANGELOG.md @@ -1,5 +1,11 @@ # Revision history for ogma-cli +## [1.4.1] - 2024-09-21 + +* Version bump 1.4.1 (#155). +* Constrain version of dependency in CI jobs (#151). +* Replace homepage (#147). + ## [1.4.0] - 2024-05-21 * Version bump 1.4.0 (#145). diff --git a/ogma-cli/ogma-cli.cabal b/ogma-cli/ogma-cli.cabal index 3aea7df..0a2559d 100644 --- a/ogma-cli/ogma-cli.cabal +++ b/ogma-cli/ogma-cli.cabal @@ -32,8 +32,8 @@ cabal-version: 2.0 build-type: Simple name: ogma-cli -version: 1.4.0 -homepage: http://nasa.gov +version: 1.4.1 +homepage: https://github.com/nasa/ogma license: OtherLicense license-file: LICENSE.pdf author: Ivan Perez, Alwyn Goodloe @@ -141,7 +141,7 @@ executable ogma build-depends: base >= 4.11.0.0 && < 5 , optparse-applicative - , ogma-core >= 1.4.0 && < 1.5 + , ogma-core >= 1.4.1 && < 1.5 hs-source-dirs: src diff --git a/ogma-core/CHANGELOG.md b/ogma-core/CHANGELOG.md index 1090c40..4796c58 100644 --- a/ogma-core/CHANGELOG.md +++ b/ogma-core/CHANGELOG.md @@ -1,5 +1,11 @@ # Revision history for ogma-core +## [1.4.1] - 2024-09-21 + +* Version bump 1.4.1 (#155). +* Remove dependency on IfElse (#150). +* Replace homepage (#147). + ## [1.4.0] - 2024-05-21 * Version bump 1.4.0 (#145). diff --git a/ogma-core/ogma-core.cabal b/ogma-core/ogma-core.cabal index a89d79e..975a0f8 100644 --- a/ogma-core/ogma-core.cabal +++ b/ogma-core/ogma-core.cabal @@ -32,8 +32,8 @@ cabal-version: 2.0 build-type: Simple name: ogma-core -version: 1.4.0 -homepage: http://nasa.gov +version: 1.4.1 +homepage: https://github.com/nasa/ogma license: OtherLicense license-file: LICENSE.pdf author: Ivan Perez, Alwyn Goodloe @@ -107,16 +107,15 @@ library , aeson >= 2.0.0.0 && < 2.2 , bytestring , filepath - , IfElse , mtl - , ogma-extra >= 1.4.0 && < 1.5 - , ogma-language-c >= 1.4.0 && < 1.5 - , ogma-language-cocospec >= 1.4.0 && < 1.5 - , ogma-language-copilot >= 1.4.0 && < 1.5 - , ogma-language-jsonspec >= 1.4.0 && < 1.5 - , ogma-language-smv >= 1.4.0 && < 1.5 - , ogma-spec >= 1.4.0 && < 1.5 + , ogma-extra >= 1.4.1 && < 1.5 + , ogma-language-c >= 1.4.1 && < 1.5 + , ogma-language-cocospec >= 1.4.1 && < 1.5 + , ogma-language-copilot >= 1.4.1 && < 1.5 + , ogma-language-jsonspec >= 1.4.1 && < 1.5 + , ogma-language-smv >= 1.4.1 && < 1.5 + , ogma-spec >= 1.4.1 && < 1.5 hs-source-dirs: src diff --git a/ogma-core/src/Command/FRETComponentSpec2Copilot.hs b/ogma-core/src/Command/FRETComponentSpec2Copilot.hs index fcf2144..74ed887 100644 --- a/ogma-core/src/Command/FRETComponentSpec2Copilot.hs +++ b/ogma-core/src/Command/FRETComponentSpec2Copilot.hs @@ -41,9 +41,9 @@ module Command.FRETComponentSpec2Copilot where -- External imports -import Control.Monad.IfElse ( awhen ) import Data.Aeson ( eitherDecode, decode ) import Data.ByteString.Lazy (fromStrict) +import Data.Foldable (for_) -- External imports: auxiliary import Data.ByteString.Extra as B ( safeReadFile ) @@ -91,7 +91,7 @@ fretComponentSpec2Copilot fp options = do let (mOutput, result) = fretComponentSpec2CopilotResult options fp copilot - awhen mOutput putStrLn + for_ mOutput putStrLn return result -- | Print the contents of a Copilot module that implements the Past-time TL diff --git a/ogma-core/src/Command/FRETReqsDB2Copilot.hs b/ogma-core/src/Command/FRETReqsDB2Copilot.hs index ee6d100..7dc52b9 100644 --- a/ogma-core/src/Command/FRETReqsDB2Copilot.hs +++ b/ogma-core/src/Command/FRETReqsDB2Copilot.hs @@ -39,9 +39,9 @@ module Command.FRETReqsDB2Copilot where -- External imports -import Control.Monad.IfElse ( awhen ) -import Data.Aeson ( eitherDecode ) -import Data.List ( nub, (\\) ) +import Data.Aeson (eitherDecode) +import Data.Foldable (for_) +import Data.List (nub, (\\)) -- External imports: auxiliary import Data.ByteString.Extra as B ( safeReadFile ) @@ -88,7 +88,7 @@ fretReqsDB2Copilot fp options = do let (mOutput, result) = fretReqsDB2CopilotResult options fp copilot - awhen mOutput putStrLn + for_ mOutput putStrLn return result -- | Print the contents of a Copilot module that implements the Past-time TL diff --git a/ogma-extra/CHANGELOG.md b/ogma-extra/CHANGELOG.md index 43c8a28..defe47b 100644 --- a/ogma-extra/CHANGELOG.md +++ b/ogma-extra/CHANGELOG.md @@ -1,5 +1,10 @@ # Revision history for ogma-extra +## [1.4.1] - 2024-09-21 + +* Version bump 1.4.1 (#155). +* Replace homepage (#147). + ## [1.4.0] - 2024-05-21 * Version bump 1.4.0 (#145). diff --git a/ogma-extra/ogma-extra.cabal b/ogma-extra/ogma-extra.cabal index f0abfb0..c4ca300 100644 --- a/ogma-extra/ogma-extra.cabal +++ b/ogma-extra/ogma-extra.cabal @@ -32,8 +32,8 @@ cabal-version: 2.0 build-type: Simple name: ogma-extra -version: 1.4.0 -homepage: http://nasa.gov +version: 1.4.1 +homepage: https://github.com/nasa/ogma license: OtherLicense license-file: LICENSE.pdf author: Ivan Perez, Alwyn Goodloe diff --git a/ogma-language-c/CHANGELOG.md b/ogma-language-c/CHANGELOG.md index e07fdcf..a5dbee5 100644 --- a/ogma-language-c/CHANGELOG.md +++ b/ogma-language-c/CHANGELOG.md @@ -1,5 +1,10 @@ # Revision history for ogma-language-c +## [1.4.1] - 2024-09-21 + +* Version bump 1.4.1 (#155). +* Replace homepage (#147). + ## [1.4.0] - 2024-05-21 * Version bump 1.4.0 (#145). diff --git a/ogma-language-c/ogma-language-c.cabal b/ogma-language-c/ogma-language-c.cabal index a7d8ebd..54c6215 100644 --- a/ogma-language-c/ogma-language-c.cabal +++ b/ogma-language-c/ogma-language-c.cabal @@ -32,8 +32,8 @@ cabal-version: 2.0 build-type: Custom name: ogma-language-c -version: 1.4.0 -homepage: http://nasa.gov +version: 1.4.1 +homepage: https://github.com/nasa/ogma license: OtherLicense license-file: LICENSE.pdf author: Ivan Perez, Alwyn Goodloe diff --git a/ogma-language-cocospec/CHANGELOG.md b/ogma-language-cocospec/CHANGELOG.md index 504b729..d886d2b 100644 --- a/ogma-language-cocospec/CHANGELOG.md +++ b/ogma-language-cocospec/CHANGELOG.md @@ -1,5 +1,10 @@ # Revision history for ogma-language-cocospec +## [1.4.1] - 2024-09-21 + +* Version bump 1.4.1 (#155). +* Replace homepage (#147). + ## [1.4.0] - 2024-05-21 * Version bump 1.4.0 (#145). diff --git a/ogma-language-cocospec/ogma-language-cocospec.cabal b/ogma-language-cocospec/ogma-language-cocospec.cabal index b5814af..2300057 100644 --- a/ogma-language-cocospec/ogma-language-cocospec.cabal +++ b/ogma-language-cocospec/ogma-language-cocospec.cabal @@ -32,8 +32,8 @@ cabal-version: 2.0 build-type: Custom name: ogma-language-cocospec -version: 1.4.0 -homepage: http://nasa.gov +version: 1.4.1 +homepage: https://github.com/nasa/ogma license: OtherLicense license-file: LICENSE.pdf author: Ivan Perez, Alwyn Goodloe diff --git a/ogma-language-copilot/CHANGELOG.md b/ogma-language-copilot/CHANGELOG.md index 0c18191..ff2a5f8 100644 --- a/ogma-language-copilot/CHANGELOG.md +++ b/ogma-language-copilot/CHANGELOG.md @@ -1,5 +1,10 @@ # Revision history for ogma-language-copilot +## [1.4.1] - 2024-09-21 + +* Version bump 1.4.1 (#155). +* Replace homepage (#147). + ## [1.4.0] - 2024-05-21 * Version bump 1.4.0 (#145). diff --git a/ogma-language-copilot/ogma-language-copilot.cabal b/ogma-language-copilot/ogma-language-copilot.cabal index 4ee0539..ee0fefe 100644 --- a/ogma-language-copilot/ogma-language-copilot.cabal +++ b/ogma-language-copilot/ogma-language-copilot.cabal @@ -32,8 +32,8 @@ cabal-version: 2.0 build-type: Simple name: ogma-language-copilot -version: 1.4.0 -homepage: http://nasa.gov +version: 1.4.1 +homepage: https://github.com/nasa/ogma license: OtherLicense license-file: LICENSE.pdf author: Ivan Perez, Alwyn Goodloe diff --git a/ogma-language-jsonspec/CHANGELOG.md b/ogma-language-jsonspec/CHANGELOG.md index ed9d1f7..9907db6 100644 --- a/ogma-language-jsonspec/CHANGELOG.md +++ b/ogma-language-jsonspec/CHANGELOG.md @@ -1,5 +1,10 @@ # Revision history for ogma-language-jsonspec +## [1.4.1] - 2024-09-21 + +* Version bump 1.4.1 (#155). +* Replace homepage (#147). + ## [1.4.0] - 2024-05-21 * Version bump 1.4.0 (#145). diff --git a/ogma-language-jsonspec/ogma-language-jsonspec.cabal b/ogma-language-jsonspec/ogma-language-jsonspec.cabal index 8817c13..a31a578 100644 --- a/ogma-language-jsonspec/ogma-language-jsonspec.cabal +++ b/ogma-language-jsonspec/ogma-language-jsonspec.cabal @@ -32,8 +32,8 @@ cabal-version: 2.0 build-type: Simple name: ogma-language-jsonspec -version: 1.4.0 -homepage: http://nasa.gov +version: 1.4.1 +homepage: https://github.com/nasa/ogma license: OtherLicense license-file: LICENSE.pdf author: Ivan Perez, Alwyn Goodloe @@ -70,7 +70,7 @@ library , megaparsec , bytestring - , ogma-spec >= 1.4.0 && < 1.5 + , ogma-spec >= 1.4.1 && < 1.5 hs-source-dirs: src diff --git a/ogma-language-smv/CHANGELOG.md b/ogma-language-smv/CHANGELOG.md index ef69fe1..cc75e12 100644 --- a/ogma-language-smv/CHANGELOG.md +++ b/ogma-language-smv/CHANGELOG.md @@ -1,5 +1,10 @@ # Revision history for ogma-language-smv +## [1.4.1] - 2024-09-21 + +* Version bump 1.4.1 (#155). +* Replace homepage (#147). + ## [1.4.0] - 2024-05-21 * Version bump 1.4.0 (#145). diff --git a/ogma-language-smv/ogma-language-smv.cabal b/ogma-language-smv/ogma-language-smv.cabal index 51c79e6..2cfb5c4 100644 --- a/ogma-language-smv/ogma-language-smv.cabal +++ b/ogma-language-smv/ogma-language-smv.cabal @@ -32,8 +32,8 @@ cabal-version: 2.0 build-type: Custom name: ogma-language-smv -version: 1.4.0 -homepage: http://nasa.gov +version: 1.4.1 +homepage: https://github.com/nasa/ogma license: OtherLicense license-file: LICENSE.pdf author: Ivan Perez, Alwyn Goodloe diff --git a/ogma-spec/CHANGELOG.md b/ogma-spec/CHANGELOG.md index 8340a7c..2ba4bcf 100644 --- a/ogma-spec/CHANGELOG.md +++ b/ogma-spec/CHANGELOG.md @@ -1,5 +1,10 @@ # Revision history for ogma-spec +## [1.4.1] - 2024-09-21 + +* Version bump 1.4.1 (#155). +* Replace homepage (#147). + ## [1.4.0] - 2024-05-21 * Version bump 1.4.0 (#145). diff --git a/ogma-spec/ogma-spec.cabal b/ogma-spec/ogma-spec.cabal index b9e0722..0e89ebf 100644 --- a/ogma-spec/ogma-spec.cabal +++ b/ogma-spec/ogma-spec.cabal @@ -32,8 +32,8 @@ cabal-version: 2.0 build-type: Simple name: ogma-spec -version: 1.4.0 -homepage: http://nasa.gov +version: 1.4.1 +homepage: https://github.com/nasa/ogma license: OtherLicense license-file: LICENSE.pdf author: Ivan Perez, Alwyn Goodloe