Skip to content

Commit

Permalink
Merge branch 'release-1.1.0' into develop. Close #112.
Browse files Browse the repository at this point in the history
**Description**

Version 1.1.0 of Ogma is ready and should be closed.

**Type**

- Management: release and publication.

**Additional context**

None.

**Requester**

- Ivan Perez.

**Method to check presence of bug**

Not applicable (not a bug).

**Expected result**

- Cabal files indicate new version number, constraints are adjusted as needed,
commit is tagged with version number.

**Solution implemented**

- Cabal files indicate new version number, constraints are adjusted as needed,
commit is tagged with version number.

**Further notes**

None.
  • Loading branch information
ivanperez-keera committed Nov 22, 2023
2 parents d429267 + 91ba18c commit 6f0f1f4
Show file tree
Hide file tree
Showing 18 changed files with 55 additions and 25 deletions.
3 changes: 2 additions & 1 deletion ogma-cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Revision history for ogma-cli

## [1.X.Y] - 2023-11-21
## [1.1.0] - 2023-11-21

* Version bump 1.1.0 (#112).
* Document cabal update step in README (#100).

## [1.0.11] - 2023-09-21
Expand Down
4 changes: 2 additions & 2 deletions ogma-cli/ogma-cli.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Simple

name: ogma-cli
version: 1.0.11
version: 1.1.0
homepage: http://nasa.gov
license: OtherLicense
license-file: LICENSE.pdf
Expand Down Expand Up @@ -141,7 +141,7 @@ executable ogma
build-depends:
base >= 4.11.0.0 && < 5
, optparse-applicative
, ogma-core >= 1.0.11 && < 1.1
, ogma-core >= 1.1.0 && < 1.2

hs-source-dirs:
src
Expand Down
3 changes: 2 additions & 1 deletion ogma-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Revision history for ogma-core

## [1.X.Y] - 2023-11-21
## [1.1.0] - 2023-11-21

* Version bump 1.1.0 (#112).
* Remove trailing spaces from cFS app template (#108).
* Replace all mentions of the Sample App (#105).

Expand Down
16 changes: 8 additions & 8 deletions ogma-core/ogma-core.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Simple

name: ogma-core
version: 1.0.11
version: 1.1.0
homepage: http://nasa.gov
license: OtherLicense
license-file: LICENSE.pdf
Expand Down Expand Up @@ -109,13 +109,13 @@ library
, IfElse
, mtl

, ogma-extra >= 1.0.11 && < 1.1
, ogma-language-c >= 1.0.11 && < 1.1
, ogma-language-cocospec >= 1.0.11 && < 1.1
, ogma-language-copilot >= 1.0.11 && < 1.1
, ogma-language-fret-cs >= 1.0.11 && < 1.1
, ogma-language-fret-reqs >= 1.0.11 && < 1.1
, ogma-language-smv >= 1.0.11 && < 1.1
, ogma-extra >= 1.1.0 && < 1.2
, ogma-language-c >= 1.1.0 && < 1.2
, ogma-language-cocospec >= 1.1.0 && < 1.2
, ogma-language-copilot >= 1.1.0 && < 1.2
, ogma-language-fret-cs >= 1.1.0 && < 1.2
, ogma-language-fret-reqs >= 1.1.0 && < 1.2
, ogma-language-smv >= 1.1.0 && < 1.2

hs-source-dirs:
src
Expand Down
4 changes: 4 additions & 0 deletions ogma-extra/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-extra

## [1.1.0] - 2023-11-21

* Version bump 1.1.0 (#112).

## [1.0.11] - 2023-09-21

* Version bump 1.0.11 (#103).
Expand Down
2 changes: 1 addition & 1 deletion ogma-extra/ogma-extra.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Simple

name: ogma-extra
version: 1.0.11
version: 1.1.0
homepage: http://nasa.gov
license: OtherLicense
license-file: LICENSE.pdf
Expand Down
4 changes: 4 additions & 0 deletions ogma-language-c/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-language-c

## [1.1.0] - 2023-11-21

* Version bump 1.1.0 (#112).

## [1.0.11] - 2023-09-21

* Version bump 1.0.11 (#103).
Expand Down
2 changes: 1 addition & 1 deletion ogma-language-c/ogma-language-c.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Custom

name: ogma-language-c
version: 1.0.11
version: 1.1.0
homepage: http://nasa.gov
license: OtherLicense
license-file: LICENSE.pdf
Expand Down
4 changes: 4 additions & 0 deletions ogma-language-cocospec/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-language-cocospec

## [1.1.0] - 2023-11-21

* Version bump 1.1.0 (#112).

## [1.0.11] - 2023-09-21

* Version bump 1.0.11 (#103).
Expand Down
2 changes: 1 addition & 1 deletion ogma-language-cocospec/ogma-language-cocospec.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Custom

name: ogma-language-cocospec
version: 1.0.11
version: 1.1.0
homepage: http://nasa.gov
license: OtherLicense
license-file: LICENSE.pdf
Expand Down
4 changes: 4 additions & 0 deletions ogma-language-copilot/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-language-copilot

## [1.1.0] - 2023-11-21

* Version bump 1.1.0 (#112).

## [1.0.11] - 2023-09-21

* Version bump 1.0.11 (#103).
Expand Down
2 changes: 1 addition & 1 deletion ogma-language-copilot/ogma-language-copilot.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Simple

name: ogma-language-copilot
version: 1.0.11
version: 1.1.0
homepage: http://nasa.gov
license: OtherLicense
license-file: LICENSE.pdf
Expand Down
4 changes: 4 additions & 0 deletions ogma-language-fret-cs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-language-fret-cs

## [1.1.0] - 2023-11-21

* Version bump 1.1.0 (#112).

## [1.0.11] - 2023-09-21

* Version bump 1.0.11 (#103).
Expand Down
8 changes: 4 additions & 4 deletions ogma-language-fret-cs/ogma-language-fret-cs.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Simple

name: ogma-language-fret-cs
version: 1.0.11
version: 1.1.0
homepage: http://nasa.gov
license: OtherLicense
license-file: LICENSE.pdf
Expand Down Expand Up @@ -68,8 +68,8 @@ library
base >= 4.11.0.0 && < 5
, aeson >= 2.0.0.0 && < 2.2

, ogma-language-cocospec >= 1.0.10 && < 1.1
, ogma-language-smv >= 1.0.10 && < 1.1
, ogma-language-cocospec >= 1.1.0 && < 1.2
, ogma-language-smv >= 1.1.0 && < 1.2

hs-source-dirs:
src
Expand All @@ -95,7 +95,7 @@ test-suite unit-tests
, test-framework
, test-framework-quickcheck2

, ogma-extra >= 1.0.10 && < 1.1
, ogma-extra >= 1.1.0 && < 1.2
, ogma-language-fret-cs

hs-source-dirs:
Expand Down
4 changes: 4 additions & 0 deletions ogma-language-fret-reqs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-language-fret-reqs

## [1.1.0] - 2023-11-21

* Version bump 1.1.0 (#112).

## [1.0.11] - 2023-09-21

* Version bump 1.0.11 (#103).
Expand Down
8 changes: 4 additions & 4 deletions ogma-language-fret-reqs/ogma-language-fret-reqs.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Simple

name: ogma-language-fret-reqs
version: 1.0.11
version: 1.1.0
homepage: http://nasa.gov
license: OtherLicense
license-file: LICENSE.pdf
Expand Down Expand Up @@ -69,8 +69,8 @@ library
, aeson >= 2.0.0.0 && < 2.2
, text

, ogma-language-cocospec >= 1.0.10 && < 1.1
, ogma-language-smv >= 1.0.10 && < 1.1
, ogma-language-cocospec >= 1.1.0 && < 1.2
, ogma-language-smv >= 1.1.0 && < 1.2

hs-source-dirs:
src
Expand All @@ -96,7 +96,7 @@ test-suite unit-tests
, test-framework
, test-framework-quickcheck2

, ogma-extra >= 1.0.10 && < 1.1
, ogma-extra >= 1.1.0 && < 1.2
, ogma-language-fret-reqs

hs-source-dirs:
Expand Down
4 changes: 4 additions & 0 deletions ogma-language-smv/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Revision history for ogma-language-smv

## [1.1.0] - 2023-11-21

* Version bump 1.1.0 (#112).

## [1.0.11] - 2023-09-21

* Version bump 1.0.11 (#103).
Expand Down
2 changes: 1 addition & 1 deletion ogma-language-smv/ogma-language-smv.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cabal-version: 2.0
build-type: Custom

name: ogma-language-smv
version: 1.0.11
version: 1.1.0
homepage: http://nasa.gov
license: OtherLicense
license-file: LICENSE.pdf
Expand Down

0 comments on commit 6f0f1f4

Please sign in to comment.