Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Cabal-syntax from 3.12 to 3.14 #1153

Closed
wants to merge 1 commit into from
Closed

Bump Cabal-syntax from 3.12 to 3.14 #1153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extract-hackage-info/extract-hackage-info.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ executable extract-hackage-info
-Wunused-packages

build-depends:
Cabal-syntax >=3.12 && <3.13,
Cabal-syntax >=3.14 && <3.15,
aeson >=2.2 && <3,
base >=4.12 && <5,
binary >=0.8 && <0.9,
Expand Down
6 changes: 3 additions & 3 deletions ormolu.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ library
other-modules: GHC.DynFlags
default-language: GHC2021
build-depends:
Cabal-syntax >=3.12 && <3.13,
Cabal-syntax >=3.14 && <3.15,
Diff >=0.4 && <2,
MemoTrie >=0.6 && <0.7,
ansi-terminal >=0.10 && <1.2,
Expand Down Expand Up @@ -132,7 +132,7 @@ executable ormolu
autogen-modules: Paths_ormolu
default-language: GHC2021
build-depends:
Cabal-syntax >=3.12 && <3.13,
Cabal-syntax >=3.14 && <3.15,
base >=4.12 && <5,
containers >=0.5 && <0.8,
directory ^>=1.3,
Expand Down Expand Up @@ -183,7 +183,7 @@ test-suite tests

default-language: GHC2021
build-depends:
Cabal-syntax >=3.12 && <3.13,
Cabal-syntax >=3.14 && <3.15,
QuickCheck >=2.14,
base >=4.14 && <5,
choice >=0.2.4.1 && <0.3,
Expand Down
6 changes: 3 additions & 3 deletions src/Ormolu/Utils/Cabal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,17 +189,17 @@ getExtensionAndDepsMap cabalFile GenericPackageDescription {..} =
extractFromLibrary Library {..} =
extractFromBuildInfo (ModuleName.toFilePath <$> exposedModules) libBuildInfo
extractFromExecutable Executable {..} =
extractFromBuildInfo [modulePath] buildInfo
extractFromBuildInfo [getSymbolicPath modulePath] buildInfo
extractFromTestSuite TestSuite {..} =
extractFromBuildInfo mainPath testBuildInfo
where
mainPath = case testInterface of
TestSuiteExeV10 _ p -> [p]
TestSuiteExeV10 _ p -> [getSymbolicPath p]
TestSuiteLibV09 _ p -> [ModuleName.toFilePath p]
TestSuiteUnsupported {} -> []
extractFromBenchmark Benchmark {..} =
extractFromBuildInfo mainPath benchmarkBuildInfo
where
mainPath = case benchmarkInterface of
BenchmarkExeV10 _ p -> [p]
BenchmarkExeV10 _ p -> [getSymbolicPath p]
BenchmarkUnsupported {} -> []
Loading