Skip to content

Commit

Permalink
Merge branch 'release-1.4.1'. Refs #155.
Browse files Browse the repository at this point in the history
  • Loading branch information
ivanperez-keera committed Sep 22, 2024
2 parents c4fc3ef + 138d459 commit 08bbdb9
Show file tree
Hide file tree
Showing 22 changed files with 83 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/repo-ghc-8.6-cabal-2.4-ros.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/repo-ghc-8.6-cabal-2.4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 6 additions & 0 deletions ogma-cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
6 changes: 3 additions & 3 deletions ogma-cli/ogma-cli.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions ogma-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
19 changes: 9 additions & 10 deletions ogma-core/ogma-core.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ogma-core/src/Command/FRETComponentSpec2Copilot.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ogma-core/src/Command/FRETReqsDB2Copilot.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ogma-extra/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
4 changes: 2 additions & 2 deletions ogma-extra/ogma-extra.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ogma-language-c/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
4 changes: 2 additions & 2 deletions ogma-language-c/ogma-language-c.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ogma-language-cocospec/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
4 changes: 2 additions & 2 deletions ogma-language-cocospec/ogma-language-cocospec.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ogma-language-copilot/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
4 changes: 2 additions & 2 deletions ogma-language-copilot/ogma-language-copilot.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ogma-language-jsonspec/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
6 changes: 3 additions & 3 deletions ogma-language-jsonspec/ogma-language-jsonspec.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ogma-language-smv/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
4 changes: 2 additions & 2 deletions ogma-language-smv/ogma-language-smv.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ogma-spec/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
4 changes: 2 additions & 2 deletions ogma-spec/ogma-spec.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 08bbdb9

Please sign in to comment.