From 385e15fc22f48a1f8d40b8263a54155fdab499ea Mon Sep 17 00:00:00 2001 From: stuebinm Date: Wed, 17 Apr 2024 01:21:33 +0200 Subject: replace protocol-buffers with proto-lens I do not really like either option, but at least the second one seems more likely to be maintained (and a little less clunky to use, too, for what it's worth). --- tracktrain.cabal | 67 ++++++++++++++------------------------------------------ 1 file changed, 16 insertions(+), 51 deletions(-) (limited to 'tracktrain.cabal') diff --git a/tracktrain.cabal b/tracktrain.cabal index d1acb1c..e763f6d 100644 --- a/tracktrain.cabal +++ b/tracktrain.cabal @@ -24,8 +24,8 @@ extra-source-files: CHANGELOG.md executable tracktrain main-is: Main.hs ghc-options: -threaded -rtsopts - build-depends: base ^>=4.15.1.0 - , bytestring >= 0.10.10.0 + build-depends: base ^>=4.17 + , bytestring ^>= 0.11 , fmt >= 0.6.3.0 , time , aeson @@ -35,13 +35,13 @@ executable tracktrain , data-default-class >= 0.1.2 , persistent-postgresql , monad-logger - , gtfs - , protocol-buffers + , gtfs-realtime , conferer , conferer-aeson , conferer-yaml , directory , extra + , proto-lens hs-source-dirs: app default-language: Haskell2010 default-extensions: OverloadedStrings @@ -49,12 +49,11 @@ executable tracktrain library - build-depends: base ^>=4.15.1.0 - , gtfs - , protocol-buffers + build-depends: base ^>=4.17 + , gtfs-realtime , zip-archive , cassava >= 0.5.2.0 - , bytestring >= 0.10.10.0 + , bytestring ^>= 0.11 , uri-bytestring , vector >= 0.12.3.1 , regex-tdfa @@ -94,7 +93,7 @@ library , yesod-auth , yesod-auth-oauth2 , yesod-core - , hoauth2 <= 2.6.0 + , hoauth2 , blaze-html , blaze-markup , timezone-olson @@ -104,6 +103,8 @@ library , prometheus-client , prometheus-metrics-ghc , exceptions + , proto-lens + , http-media hs-source-dirs: lib exposed-modules: GTFS , Server @@ -122,46 +123,10 @@ library , ScopedTypeVariables , ViewPatterns -library gtfs - build-depends: base ^>=4.15.1.0 - , protocol-buffers - , protocol-buffers-descriptor - , servant - , servant-server - , http-media - , either - , swagger2 +library gtfs-realtime + build-depends: base ^>=4.17 + , proto-lens-runtime default-language: Haskell2010 - hs-source-dirs: gtfs - exposed-modules: GTFS.Realtime - , GTFS.Realtime.Alert - , GTFS.Realtime.Alert.Cause - , GTFS.Realtime.Alert.Effect - , GTFS.Realtime.Alert.SeverityLevel - , GTFS.Realtime.EntitySelector - , GTFS.Realtime.FeedEntity - , GTFS.Realtime.FeedHeader - , GTFS.Realtime.FeedHeader.Incrementality - , GTFS.Realtime.FeedMessage - , GTFS.Realtime.Position - , GTFS.Realtime.Shape - , GTFS.Realtime.TimeRange - , GTFS.Realtime.TranslatedImage - , GTFS.Realtime.TranslatedImage.LocalizedImage - , GTFS.Realtime.TranslatedString - , GTFS.Realtime.TranslatedString.Translation - , GTFS.Realtime.TripDescriptor - , GTFS.Realtime.TripDescriptor.ScheduleRelationship - , GTFS.Realtime.TripUpdate - , GTFS.Realtime.TripUpdate.StopTimeEvent - , GTFS.Realtime.TripUpdate.StopTimeUpdate - , GTFS.Realtime.TripUpdate.StopTimeUpdate.ScheduleRelationship - , GTFS.Realtime.TripUpdate.StopTimeUpdate.StopTimeProperties - , GTFS.Realtime.TripUpdate.TripProperties - , GTFS.Realtime.VehicleDescriptor - , GTFS.Realtime.VehiclePosition - , GTFS.Realtime.VehiclePosition.CarriageDetails - , GTFS.Realtime.VehiclePosition.CongestionLevel - , GTFS.Realtime.VehiclePosition.OccupancyStatus - , GTFS.Realtime.VehiclePosition.VehicleStopStatus - , Servant.GTFS.Realtime + hs-source-dirs: gtfs-realtime + exposed-modules: Proto.GtfsRealtime + , Proto.GtfsRealtime_Fields -- cgit v1.2.3