From b5bc76bd70fd471c56f49b459d2aa739596281b7 Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko Date: Tue, 21 May 2024 20:20:02 +0200 Subject: [PATCH] Drop 9.0, add 9.2, 9.8, 9.10 --- .github/workflows/ci.yml | 2 +- cabal.project | 36 +++++++++++++++++++ telegram-bot-api/telegram-bot-api.cabal | 2 +- .../src/Telegram/Bot/Simple/Reply.hs | 1 + 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a65d64..c91aaab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - ghc: ["9.0.2", "9.4", "9.6"] + ghc: ["9.2", "9.4", "9.6", "9.8", "9.10"] cabal: ["3.10.3.0"] os: [ubuntu-latest] name: build and test (cabal) diff --git a/cabal.project b/cabal.project index 882c428..e8306d4 100644 --- a/cabal.project +++ b/cabal.project @@ -1,3 +1,39 @@ packages: telegram-bot-api/ telegram-bot-simple/ + + +allow-newer: deepseq:base +allow-newer: vault:base +allow-newer: array:base +allow-newer: wai-app-static:wai +allow-newer: http2:containers +allow-newer: servant-server:warp +allow-newer: servant-server:wai-app-static +allow-newer: servant-server:http-types +allow-newer: servant-server:either +allow-newer: servant-server:base +allow-newer: servant-client-core:base +allow-newer: servant-client-core:containers +allow-newer: servant-client-core:template-haskell +allow-newer: servant-multipart-client:servant-server +allow-newer: servant-multipart:servant-server +allow-newer: servant-server:containers +allow-newer: servant-server:base-compat +allow-newer: servant-docs:base-compat +allow-newer: servant-docs:base +allow-newer: servant-client:base +allow-newer: servant-client:containers +allow-newer: servant:base +allow-newer: servant-foreign:base +allow-newer: singleton-bool:base +allow-newer: http-api-data:base +allow-newer: http-api-data:containers +allow-newer: uuid-types:template-haskell +allow-newer: dhall:containers +allow-newer: dhall:template-haskell +allow-newer: repline:containers +allow-newer: haskeline:base +allow-newer: serialise:base +allow-newer: cborg:base +allow-newer: cborg-json:base diff --git a/telegram-bot-api/telegram-bot-api.cabal b/telegram-bot-api/telegram-bot-api.cabal index 7b3fd9a..a83ea5e 100644 --- a/telegram-bot-api/telegram-bot-api.cabal +++ b/telegram-bot-api/telegram-bot-api.cabal @@ -247,7 +247,7 @@ library build-depends: aeson , aeson-pretty - , base >=4.9 && <5 + , base >=4.16 && <5 , bytestring , cron >=0.7.0 , filepath diff --git a/telegram-bot-simple/src/Telegram/Bot/Simple/Reply.hs b/telegram-bot-simple/src/Telegram/Bot/Simple/Reply.hs index ca36a9f..0e3587c 100644 --- a/telegram-bot-simple/src/Telegram/Bot/Simple/Reply.hs +++ b/telegram-bot-simple/src/Telegram/Bot/Simple/Reply.hs @@ -60,6 +60,7 @@ toReplyMessage text replyMessageToSendMessageRequest :: SomeChatId -> ReplyMessage -> SendMessageRequest replyMessageToSendMessageRequest someChatId ReplyMessage{..} = SendMessageRequest { sendMessageChatId = someChatId + , sendMessageBusinessConnectionId = Nothing , sendMessageMessageThreadId = replyMessageMessageThreadId , sendMessageText = replyMessageText , sendMessageParseMode = replyMessageParseMode