Merge origin/develop-to-main to origin/develop

Develop to main for beta 2.1.1
Bump to beta 2.1.1
2024-01-12 17:22:32 +01:00 · 2024-01-12 17:18:01 +01:00 · 2024-01-12 17:15:07 +01:00 · 2024-01-12 17:12:24 +01:00 · 2024-01-12 17:11:07 +01:00
4 changed files with 4 additions and 4 deletions
--- a/elm.json
+++ b/elm.json
@ -3,7 +3,7 @@
    "name": "noordstar/elm-matrix-sdk-beta",
    "summary": "Matrix SDK for instant communication. Unstable beta version for testing only.",
    "license": "EUPL-1.1",
-    "version": "2.1.0",
+    "version": "2.1.1",
    "exposed-modules": [
        "Matrix",
        "Matrix.Event",
--- a/src/Internal/Config/Default.elm
+++ b/src/Internal/Config/Default.elm
@ -23,7 +23,7 @@ will assume until overriden by the user.
 -}
 currentVersion : String
 currentVersion =
-    "beta 2.1.0"
+    "beta 2.1.1"


 {-| The default device name that is being communicated with the Matrix API.
--- a/src/Matrix/Settings.elm
+++ b/src/Matrix/Settings.elm
@ -68,4 +68,4 @@ getSyncTime (Vault vault) =
 -}
 setSyncTime : Int -> Vault -> Vault
 setSyncTime time (Vault vault) =
-    Vault <| Envelope.mapSettings (\s -> { s | syncTime = time }) vault
+    Vault <| Envelope.mapSettings (\s -> { s | syncTime = max 1 time }) vault
--- a/tests/Test/Matrix/Settings.elm
+++ b/tests/Test/Matrix/Settings.elm
@ -27,7 +27,7 @@ settings =
                    vault
                        |> Matrix.Settings.setSyncTime sync
                        |> Matrix.Settings.getSyncTime
-                        |> Expect.equal sync
+                        |> Expect.equal (max 1 sync)
                )
            ]
Author	SHA1	Message	Date
BramvdnHeuvel	ef9b007730	Merge origin/develop-to-main to origin/develop Develop to main for beta 2.1.1	2024-01-12 17:22:32 +01:00
Bram van den Heuvel	311de94c1f	Bump to beta 2.1.1	2024-01-12 17:18:01 +01:00
Bram van den Heuvel	462aa3a2dc	Fix test	2024-01-12 17:15:07 +01:00
BramvdnHeuvel	cecf9c1f77	Merge pull request #11 from noordstar/settings-patch Update syncTime to be at least 1	2024-01-12 17:12:24 +01:00
Bram van den Heuvel	ad3f45d035	Update syncTime to be at least 1	2024-01-12 17:11:07 +01:00