From 9b23fc0e5aa7c8faafe91c4720ccbf45af2bb91f Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 24 Dec 2024 23:48:17 +0000 Subject: [PATCH 01/14] ogma-extra: Add version bounds to all dependencies. Refs #119. The cabal packages do not currently specify all version bounds. This makes hackage complain when we upload packages, and can create stability / installation issues for users. This commit adds lower and upper version bounds for all dependencies. --- ogma-extra/ogma-extra.cabal | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ogma-extra/ogma-extra.cabal b/ogma-extra/ogma-extra.cabal index 0ba62d0..5ee7f77 100644 --- a/ogma-extra/ogma-extra.cabal +++ b/ogma-extra/ogma-extra.cabal @@ -76,10 +76,10 @@ library build-depends: base >= 4.11.0.0 && < 5 , aeson >= 2.0.0.0 && < 2.2 - , bytestring - , Cabal - , directory - , filepath + , bytestring >= 0.10.8.2 && < 0.13 + , Cabal >= 2.2.0.0 && < 3.9 + , directory >= 1.3.1.5 && < 1.4 + , filepath >= 1.4.2 && < 1.6 , microstache >= 1.0 && < 1.1 , text >= 1.2.3.1 && < 2.1 @@ -100,10 +100,10 @@ test-suite unit-tests Main.hs build-depends: - base - , QuickCheck - , test-framework - , test-framework-quickcheck2 + base >= 4.11.0.0 && < 5 + , QuickCheck >= 2.8.2 && < 2.16 + , test-framework >= 0.8.2 && < 0.9 + , test-framework-quickcheck2 >= 0.3.0.4 && < 0.4 , ogma-extra From 6a021a7c6f96b74130b4ced215f22a2e53f17196 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 24 Dec 2024 23:48:17 +0000 Subject: [PATCH 02/14] ogma-language-c: Add version bounds to all dependencies. Refs #119. The cabal packages do not currently specify all version bounds. This makes hackage complain when we upload packages, and can create stability / installation issues for users. This commit adds lower and upper version bounds for all dependencies. --- ogma-language-c/ogma-language-c.cabal | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ogma-language-c/ogma-language-c.cabal b/ogma-language-c/ogma-language-c.cabal index 62c7df0..7a738d5 100644 --- a/ogma-language-c/ogma-language-c.cabal +++ b/ogma-language-c/ogma-language-c.cabal @@ -71,8 +71,8 @@ custom-setup setup-depends: base >= 4.11.0.0 && < 5 , Cabal >= 2.0 && < 3.9 - , process - , BNFC >= 2.9.1 + , process >= 1.6 && < 1.7 + , BNFC >= 2.9.1 && < 2.10 library @@ -91,7 +91,7 @@ library build-depends: base >= 4.11.0.0 && < 5 - , array >= 0.5.2.0 + , array >= 0.5.2.0 && < 0.6 hs-source-dirs: src @@ -108,9 +108,9 @@ test-suite unit-tests build-depends: base >= 4.11.0.0 && < 5 - , QuickCheck - , test-framework - , test-framework-quickcheck2 + , QuickCheck >= 2.8.2 && < 2.16 + , test-framework >= 0.8.2 && < 0.9 + , test-framework-quickcheck2 >= 0.3.0.4 && < 0.4 , ogma-language-c From 6a6b7325072870b8735080f0f4682bc04e94f069 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 24 Dec 2024 23:48:17 +0000 Subject: [PATCH 03/14] ogma-language-cocospec: Add version bounds to all dependencies. Refs #119. The cabal packages do not currently specify all version bounds. This makes hackage complain when we upload packages, and can create stability / installation issues for users. This commit adds lower and upper version bounds for all dependencies. --- ogma-language-cocospec/ogma-language-cocospec.cabal | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ogma-language-cocospec/ogma-language-cocospec.cabal b/ogma-language-cocospec/ogma-language-cocospec.cabal index e7ef546..edacc81 100644 --- a/ogma-language-cocospec/ogma-language-cocospec.cabal +++ b/ogma-language-cocospec/ogma-language-cocospec.cabal @@ -72,8 +72,8 @@ custom-setup setup-depends: base >= 4.11.0.0 && < 5 , Cabal >= 2.0 && < 3.9 - , process - , BNFC >= 2.9.1 + , process >= 1.6 && < 1.7 + , BNFC >= 2.9.1 && < 2.10 library @@ -92,7 +92,7 @@ library build-depends: base >= 4.11.0.0 && < 5 - , array >= 0.5.2.0 + , array >= 0.5.2.0 && < 0.6 hs-source-dirs: src @@ -109,9 +109,9 @@ test-suite unit-tests build-depends: base >= 4.11.0.0 && < 5 - , QuickCheck - , test-framework - , test-framework-quickcheck2 + , QuickCheck >= 2.8.2 && < 2.16 + , test-framework >= 0.8.2 && < 0.9 + , test-framework-quickcheck2 >= 0.3.0.4 && < 0.4 , ogma-language-cocospec From e31e9b1c0417155afd596888fffc1d43caba703f Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 24 Dec 2024 23:48:17 +0000 Subject: [PATCH 04/14] ogma-language-jsonspec: Add version bounds to all dependencies. Refs #119. The cabal packages do not currently specify all version bounds. This makes hackage complain when we upload packages, and can create stability / installation issues for users. This commit adds lower and upper version bounds for all dependencies. --- ogma-language-jsonspec/ogma-language-jsonspec.cabal | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ogma-language-jsonspec/ogma-language-jsonspec.cabal b/ogma-language-jsonspec/ogma-language-jsonspec.cabal index 36ec94d..b4ad743 100644 --- a/ogma-language-jsonspec/ogma-language-jsonspec.cabal +++ b/ogma-language-jsonspec/ogma-language-jsonspec.cabal @@ -72,9 +72,9 @@ library base >= 4.11.0.0 && < 5 , aeson >= 2.0.0.0 && < 2.2 , jsonpath >= 0.3 && < 0.4 - , text - , megaparsec - , bytestring + , text >= 1.2.3.1 && < 2.1 + , megaparsec >= 8.0.0 && < 9.10 + , bytestring >= 0.10.8.2 && < 0.13 , ogma-spec >= 1.5.0 && < 1.6 From e4c7ea3069de12a3eebfcf4b344d65853f5b8ecd Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 24 Dec 2024 23:48:17 +0000 Subject: [PATCH 05/14] ogma-language-smv: Add version bounds to all dependencies. Refs #119. The cabal packages do not currently specify all version bounds. This makes hackage complain when we upload packages, and can create stability / installation issues for users. This commit adds lower and upper version bounds for all dependencies. --- ogma-language-smv/ogma-language-smv.cabal | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ogma-language-smv/ogma-language-smv.cabal b/ogma-language-smv/ogma-language-smv.cabal index ccbc35f..efc4064 100644 --- a/ogma-language-smv/ogma-language-smv.cabal +++ b/ogma-language-smv/ogma-language-smv.cabal @@ -72,8 +72,8 @@ custom-setup setup-depends: base >= 4.11.0.0 && < 5 , Cabal >= 2.0 && < 3.9 - , process - , BNFC >= 2.9.1 + , process >= 1.6 && < 1.7 + , BNFC >= 2.9.1 && < 2.10 library @@ -93,7 +93,7 @@ library build-depends: base >= 4.11.0.0 && < 5 - , array >= 0.5.2.0 + , array >= 0.5.2.0 && < 0.6 hs-source-dirs: src @@ -110,9 +110,9 @@ test-suite unit-tests build-depends: base >= 4.11.0.0 && < 5 - , QuickCheck - , test-framework - , test-framework-quickcheck2 + , QuickCheck >= 2.8.2 && < 2.16 + , test-framework >= 0.8.2 && < 0.9 + , test-framework-quickcheck2 >= 0.3.0.4 && < 0.4 , ogma-language-smv From 0f4955213a8a6c947b4c81848259f95e1c1142ff Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 24 Dec 2024 23:48:17 +0000 Subject: [PATCH 06/14] ogma-core: Add version bounds to all dependencies. Refs #119. The cabal packages do not currently specify all version bounds. This makes hackage complain when we upload packages, and can create stability / installation issues for users. This commit adds lower and upper version bounds for all dependencies. --- ogma-core/ogma-core.cabal | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ogma-core/ogma-core.cabal b/ogma-core/ogma-core.cabal index 890c8f6..c7a0e7a 100644 --- a/ogma-core/ogma-core.cabal +++ b/ogma-core/ogma-core.cabal @@ -119,9 +119,9 @@ library build-depends: base >= 4.11.0.0 && < 5 , aeson >= 2.0.0.0 && < 2.2 - , bytestring - , filepath - , mtl + , bytestring >= 0.10.8.2 && < 0.13 + , filepath >= 1.4.2 && < 1.6 + , mtl >= 2.2.2 && < 2.4 , text >= 1.2.3.1 && < 2.1 , ogma-extra >= 1.5.0 && < 1.6 @@ -149,13 +149,13 @@ test-suite unit-tests Main.hs build-depends: - base - , directory - , HUnit - , QuickCheck - , test-framework - , test-framework-hunit - , test-framework-quickcheck2 + base >= 4.11.0.0 && < 5 + , directory >= 1.3.1.5 && < 1.4 + , HUnit >= 1.2.0.0 && < 1.7 + , QuickCheck >= 2.8.2 && < 2.16 + , test-framework >= 0.8.2 && < 0.9 + , test-framework-hunit >= 0.2.0 && < 0.4 + , test-framework-quickcheck2 >= 0.3.0.4 && < 0.4 , ogma-core From 923b7fad833b347fdd8c20665e825226b78ef46c Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 24 Dec 2024 23:48:17 +0000 Subject: [PATCH 07/14] ogma-cli: Add version bounds to all dependencies. Refs #119. The cabal packages do not currently specify all version bounds. This makes hackage complain when we upload packages, and can create stability / installation issues for users. This commit adds lower and upper version bounds for all dependencies. --- ogma-cli/ogma-cli.cabal | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ogma-cli/ogma-cli.cabal b/ogma-cli/ogma-cli.cabal index 30dc181..0c54a64 100644 --- a/ogma-cli/ogma-cli.cabal +++ b/ogma-cli/ogma-cli.cabal @@ -139,7 +139,7 @@ executable ogma build-depends: base >= 4.11.0.0 && < 5 - , optparse-applicative + , optparse-applicative >= 0.14 && < 0.19 , ogma-core >= 1.5.0 && < 1.6 hs-source-dirs: @@ -160,11 +160,11 @@ test-suite test-ogma build-depends: base >= 4.11.0.0 && < 5 - , HUnit - , process - , test-framework - , test-framework-hunit - , unix + , HUnit >= 1.2.0.0 && < 1.7 + , process >= 1.6 && < 1.7 + , test-framework >= 0.8.2 && < 0.9 + , test-framework-hunit >= 0.2.0 && < 0.4 + , unix >= 2.7.2.2 && < 2.9 hs-source-dirs: tests From 125a8cad9e3a8ec01964a3a549c9fdbdc45a2a2f Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 24 Dec 2024 23:51:32 +0000 Subject: [PATCH 08/14] ogma-extra: Document changes in CHANGELOG. Refs #119. --- ogma-extra/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ogma-extra/CHANGELOG.md b/ogma-extra/CHANGELOG.md index d1e9e22..7db7409 100644 --- a/ogma-extra/CHANGELOG.md +++ b/ogma-extra/CHANGELOG.md @@ -4,6 +4,7 @@ * Deprecate unnecessary functions (#185). * Add repository information to cabal package (#148). +* Add version bounds to all dependencies (#119). ## [1.5.0] - 2024-11-21 From fea77b3cd5e1183d68f5a5b8abc67ed3e7e8ec91 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 24 Dec 2024 23:51:32 +0000 Subject: [PATCH 09/14] ogma-language-c: Document changes in CHANGELOG. Refs #119. --- ogma-language-c/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ogma-language-c/CHANGELOG.md b/ogma-language-c/CHANGELOG.md index 847e49f..cee6f99 100644 --- a/ogma-language-c/CHANGELOG.md +++ b/ogma-language-c/CHANGELOG.md @@ -3,6 +3,7 @@ ## [1.X.Y] - 2024-12-24 * Add repository information to cabal package (#148). +* Add version bounds to all dependencies (#119). ## [1.5.0] - 2024-11-21 From 4aec3f208a8e7e5b1fbc36f7990258f5097c66c6 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 24 Dec 2024 23:51:32 +0000 Subject: [PATCH 10/14] ogma-language-cocospec: Document changes in CHANGELOG. Refs #119. --- ogma-language-cocospec/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ogma-language-cocospec/CHANGELOG.md b/ogma-language-cocospec/CHANGELOG.md index 0baff7f..819c93f 100644 --- a/ogma-language-cocospec/CHANGELOG.md +++ b/ogma-language-cocospec/CHANGELOG.md @@ -3,6 +3,7 @@ ## [1.X.Y] - 2024-12-24 * Add repository information to cabal package (#148). +* Add version bounds to all dependencies (#119). ## [1.5.0] - 2024-11-21 From 73954e46ee909cbef8d3cf7bf1986e6276f3a626 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 24 Dec 2024 23:51:32 +0000 Subject: [PATCH 11/14] ogma-language-jsonspec: Document changes in CHANGELOG. Refs #119. --- ogma-language-jsonspec/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ogma-language-jsonspec/CHANGELOG.md b/ogma-language-jsonspec/CHANGELOG.md index 19682a0..6c018ca 100644 --- a/ogma-language-jsonspec/CHANGELOG.md +++ b/ogma-language-jsonspec/CHANGELOG.md @@ -3,6 +3,7 @@ ## [1.X.Y] - 2024-12-24 * Add repository information to cabal package (#148). +* Add version bounds to all dependencies (#119). ## [1.5.0] - 2024-11-21 From 95e4e97fd047b15d41840e7a84b4de2a85eefaed Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 24 Dec 2024 23:51:32 +0000 Subject: [PATCH 12/14] ogma-language-smv: Document changes in CHANGELOG. Refs #119. --- ogma-language-smv/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ogma-language-smv/CHANGELOG.md b/ogma-language-smv/CHANGELOG.md index b5fd5ae..376ce93 100644 --- a/ogma-language-smv/CHANGELOG.md +++ b/ogma-language-smv/CHANGELOG.md @@ -3,6 +3,7 @@ ## [1.X.Y] - 2024-12-24 * Add repository information to cabal package (#148). +* Add version bounds to all dependencies (#119). ## [1.5.0] - 2024-11-21 From f99dfa0f92a35c1c68a1d9c6602c1069f0310748 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 24 Dec 2024 23:51:32 +0000 Subject: [PATCH 13/14] ogma-core: Document changes in CHANGELOG. Refs #119. --- ogma-core/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ogma-core/CHANGELOG.md b/ogma-core/CHANGELOG.md index ccfe1f5..38a6f99 100644 --- a/ogma-core/CHANGELOG.md +++ b/ogma-core/CHANGELOG.md @@ -6,6 +6,7 @@ * Use template expansion system to generate F' monitoring component (#185). * Use template expansion system to generate standalone Copilot monitor (#189). * Add repository information to cabal package (#148). +* Add version bounds to all dependencies (#119). ## [1.5.0] - 2024-11-21 From cc38a221e10bf85edde7b54b24720cb048aa8db9 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Tue, 24 Dec 2024 23:51:32 +0000 Subject: [PATCH 14/14] ogma-cli: Document changes in CHANGELOG. Refs #119. --- ogma-cli/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ogma-cli/CHANGELOG.md b/ogma-cli/CHANGELOG.md index 4712374..e1436a4 100644 --- a/ogma-cli/CHANGELOG.md +++ b/ogma-cli/CHANGELOG.md @@ -6,6 +6,7 @@ * Provide ability to customize template in fprime command (#185). * Provide ability to customize template in standalone command (#189). * Add repository information to cabal package (#148). +* Add version bounds to all dependencies (#119). ## [1.5.0] - 2024-11-21