diff --git a/package.yaml b/package.yaml index 663ae5bc26..f7fc614789 100644 --- a/package.yaml +++ b/package.yaml @@ -32,7 +32,7 @@ dependencies: - exceptions == 0.10.* - filepath == 1.4.* - http-types == 0.12.* - - http2 + - http2 == 4.1.* - memory == 0.18.* - mtl == 2.3.* - network >= 3.1.2.7 && < 3.2 @@ -50,7 +50,7 @@ dependencies: - terminal == 0.2.* - text == 2.0.* - time == 1.9.* - - tls + - tls >= 1.6.0 && < 1.7 - unliftio == 0.2.* - unliftio-core == 0.2.* - zip == 2.0.* diff --git a/simplex-chat.cabal b/simplex-chat.cabal index 8963203c11..8fa33f07f6 100644 --- a/simplex-chat.cabal +++ b/simplex-chat.cabal @@ -113,8 +113,8 @@ library Simplex.Chat.Migrations.M20230903_connections_to_subscribe Simplex.Chat.Migrations.M20230913_member_contacts Simplex.Chat.Migrations.M20230914_member_probes - Simplex.Chat.Migrations.M20230922_remote_controller Simplex.Chat.Migrations.M20230926_contact_status + Simplex.Chat.Migrations.M20231005_remote_controller Simplex.Chat.Mobile Simplex.Chat.Mobile.File Simplex.Chat.Mobile.Shared @@ -170,7 +170,7 @@ library , exceptions ==0.10.* , filepath ==1.4.* , http-types ==0.12.* - , http2 + , http2 ==4.1.* , memory ==0.18.* , mtl ==2.3.* , network >=3.1.2.7 && <3.2 @@ -188,7 +188,7 @@ library , terminal ==0.2.* , text ==2.0.* , time ==1.9.* - , tls + , tls >=1.6.0 && <1.7 , unliftio ==0.2.* , unliftio-core ==0.2.* , zip ==2.0.* @@ -223,7 +223,7 @@ executable simplex-bot , exceptions ==0.10.* , filepath ==1.4.* , http-types ==0.12.* - , http2 + , http2 ==4.1.* , memory ==0.18.* , mtl ==2.3.* , network >=3.1.2.7 && <3.2 @@ -242,7 +242,7 @@ executable simplex-bot , terminal ==0.2.* , text ==2.0.* , time ==1.9.* - , tls + , tls >=1.6.0 && <1.7 , unliftio ==0.2.* , unliftio-core ==0.2.* , zip ==2.0.* @@ -277,7 +277,7 @@ executable simplex-bot-advanced , exceptions ==0.10.* , filepath ==1.4.* , http-types ==0.12.* - , http2 + , http2 ==4.1.* , memory ==0.18.* , mtl ==2.3.* , network >=3.1.2.7 && <3.2 @@ -296,7 +296,7 @@ executable simplex-bot-advanced , terminal ==0.2.* , text ==2.0.* , time ==1.9.* - , tls + , tls >=1.6.0 && <1.7 , unliftio ==0.2.* , unliftio-core ==0.2.* , zip ==2.0.* @@ -333,7 +333,7 @@ executable simplex-broadcast-bot , exceptions ==0.10.* , filepath ==1.4.* , http-types ==0.12.* - , http2 + , http2 ==4.1.* , memory ==0.18.* , mtl ==2.3.* , network >=3.1.2.7 && <3.2 @@ -352,7 +352,7 @@ executable simplex-broadcast-bot , terminal ==0.2.* , text ==2.0.* , time ==1.9.* - , tls + , tls >=1.6.0 && <1.7 , unliftio ==0.2.* , unliftio-core ==0.2.* , zip ==2.0.* @@ -388,7 +388,7 @@ executable simplex-chat , exceptions ==0.10.* , filepath ==1.4.* , http-types ==0.12.* - , http2 + , http2 ==4.1.* , memory ==0.18.* , mtl ==2.3.* , network ==3.1.* @@ -407,7 +407,7 @@ executable simplex-chat , terminal ==0.2.* , text ==2.0.* , time ==1.9.* - , tls + , tls >=1.6.0 && <1.7 , unliftio ==0.2.* , unliftio-core ==0.2.* , websockets ==0.12.* @@ -447,7 +447,7 @@ executable simplex-directory-service , exceptions ==0.10.* , filepath ==1.4.* , http-types ==0.12.* - , http2 + , http2 ==4.1.* , memory ==0.18.* , mtl ==2.3.* , network >=3.1.2.7 && <3.2 @@ -466,7 +466,7 @@ executable simplex-directory-service , terminal ==0.2.* , text ==2.0.* , time ==1.9.* - , tls + , tls >=1.6.0 && <1.7 , unliftio ==0.2.* , unliftio-core ==0.2.* , zip ==2.0.* @@ -529,7 +529,7 @@ test-suite simplex-chat-test , filepath ==1.4.* , hspec ==2.11.* , http-types ==0.12.* - , http2 + , http2 ==4.1.* , memory ==0.18.* , mtl ==2.3.* , network ==3.1.* @@ -549,7 +549,7 @@ test-suite simplex-chat-test , terminal ==0.2.* , text ==2.0.* , time ==1.9.* - , tls + , tls >=1.6.0 && <1.7 , unliftio ==0.2.* , unliftio-core ==0.2.* , zip ==2.0.* diff --git a/src/Simplex/Chat/Migrations/M20230922_remote_controller.hs b/src/Simplex/Chat/Migrations/M20231005_remote_controller.hs similarity index 84% rename from src/Simplex/Chat/Migrations/M20230922_remote_controller.hs rename to src/Simplex/Chat/Migrations/M20231005_remote_controller.hs index 21d653d124..0cb8634999 100644 --- a/src/Simplex/Chat/Migrations/M20230922_remote_controller.hs +++ b/src/Simplex/Chat/Migrations/M20231005_remote_controller.hs @@ -1,12 +1,12 @@ {-# LANGUAGE QuasiQuotes #-} -module Simplex.Chat.Migrations.M20230922_remote_controller where +module Simplex.Chat.Migrations.M20231005_remote_controller where import Database.SQLite.Simple (Query) import Database.SQLite.Simple.QQ (sql) -m20230922_remote_controller :: Query -m20230922_remote_controller = +m20231005_remote_controller :: Query +m20231005_remote_controller = [sql| CREATE TABLE remote_hosts ( -- hosts known to a controlling app remote_host_id INTEGER PRIMARY KEY AUTOINCREMENT, @@ -25,8 +25,8 @@ CREATE TABLE remote_controllers ( -- controllers known to a hosting app ); |] -down_m20230922_remote_controller :: Query -down_m20230922_remote_controller = +down_m20231005_remote_controller :: Query +down_m20231005_remote_controller = [sql| DROP TABLE remote_hosts; DROP TABLE remote_controllers; diff --git a/src/Simplex/Chat/Store/Migrations.hs b/src/Simplex/Chat/Store/Migrations.hs index c694a53714..5d789003a5 100644 --- a/src/Simplex/Chat/Store/Migrations.hs +++ b/src/Simplex/Chat/Store/Migrations.hs @@ -81,8 +81,8 @@ import Simplex.Chat.Migrations.M20230829_connections_chat_vrange import Simplex.Chat.Migrations.M20230903_connections_to_subscribe import Simplex.Chat.Migrations.M20230913_member_contacts import Simplex.Chat.Migrations.M20230914_member_probes -import Simplex.Chat.Migrations.M20230922_remote_controller import Simplex.Chat.Migrations.M20230926_contact_status +import Simplex.Chat.Migrations.M20231005_remote_controller import Simplex.Messaging.Agent.Store.SQLite.Migrations (Migration (..)) schemaMigrations :: [(String, Query, Maybe Query)] @@ -164,8 +164,8 @@ schemaMigrations = ("20230903_connections_to_subscribe", m20230903_connections_to_subscribe, Just down_m20230903_connections_to_subscribe), ("20230913_member_contacts", m20230913_member_contacts, Just down_m20230913_member_contacts), ("20230914_member_probes", m20230914_member_probes, Just down_m20230914_member_probes), - ("20230922_remote_controller", m20230922_remote_controller, Just down_m20230922_remote_controller), - ("20230926_contact_status", m20230926_contact_status, Just down_m20230926_contact_status) + ("20230926_contact_status", m20230926_contact_status, Just down_m20230926_contact_status), + ("20231005_remote_controller", m20231005_remote_controller, Just down_m20231005_remote_controller) ] -- | The list of migrations in ascending order by date