noordstar
/
elm-matrix-sdk-beta
mirror of https://github.com/noordstar/elm-matrix-sdk-beta
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into 3-timeline

pull/17/head
Bram 2024-01-23 19:20:44 +01:00
parent 2f7a247dbd ef9b007730
commit b6e181237f
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/before-merge.md
View File

@ -8,6 +8,7 @@ If you wish to merge your branch to the `develop` branch, make sure to follow th
- [ ] Run `elm-format` to ensure the correct formatting of the Elm files. - [ ] Run `elm-format` to ensure the correct formatting of the Elm files.
- [ ] Use `elm-doc-preview` to verify whether the documentation is up to standards. - [ ] Use `elm-doc-preview` to verify whether the documentation is up to standards.
- [ ] Run `elm-test` to verify that all tests run successfully.
## The `develop` branch to `main` ## The `develop` branch to `main`
@ -17,6 +18,7 @@ Before that is being done, however, the following tasks should be done:
- [ ] Run `elm-format` to ensure the correct formatting of the Elm files. - [ ] Run `elm-format` to ensure the correct formatting of the Elm files.
- [ ] Use `elm-doc-preview` to verify whether the documentation is up to standards. - [ ] Use `elm-doc-preview` to verify whether the documentation is up to standards.
- [ ] Run `elm-test --fuzz 1000` to verify that all tests run successfully.
- [ ] Remove exposed modules from `elm.json` that do not need to be exposed modules in the release. - [ ] Remove exposed modules from `elm.json` that do not need to be exposed modules in the release.
- [ ] Run `elm bump` to update the library's version number - [ ] Run `elm bump` to update the library's version number
- [ ] Update the version name in the [default values config file](../src/Internal/Config/Default.elm). - [ ] Update the version name in the [default values config file](../src/Internal/Config/Default.elm).

2
elm.json
View File

@ -3,7 +3,7 @@
"name": "noordstar/elm-matrix-sdk-beta", "name": "noordstar/elm-matrix-sdk-beta",
"summary": "Matrix SDK for instant communication. Unstable beta version for testing only.", "summary": "Matrix SDK for instant communication. Unstable beta version for testing only.",
"license": "EUPL-1.1", "license": "EUPL-1.1",
"version": "2.0.0", "version": "2.1.1",
"exposed-modules": [ "exposed-modules": [
"Matrix", "Matrix",
"Matrix.Event", "Matrix.Event",

2
src/Internal/Config/Default.elm
View File

@ -23,7 +23,7 @@ will assume until overriden by the user.
-} -}
currentVersion : String currentVersion : String
currentVersion = currentVersion =
"beta 2.0.0" "beta 2.1.1"
{-| The default device name that is being communicated with the Matrix API. {-| The default device name that is being communicated with the Matrix API.

2
src/Matrix/Settings.elm
View File

@ -68,4 +68,4 @@ getSyncTime (Vault vault) =
-} -}
setSyncTime : Int -> Vault -> Vault setSyncTime : Int -> Vault -> Vault
setSyncTime time (Vault vault) = setSyncTime time (Vault vault) =
Vault <| Envelope.mapSettings (\s -> { s | syncTime = time }) vault Vault <| Envelope.mapSettings (\s -> { s | syncTime = max 1 time }) vault

2
tests/Test/Matrix/Settings.elm
View File

@ -27,7 +27,7 @@ settings =
vault vault
|> Matrix.Settings.setSyncTime sync |> Matrix.Settings.setSyncTime sync
|> Matrix.Settings.getSyncTime |> Matrix.Settings.getSyncTime
|> Expect.equal sync |> Expect.equal (max 1 sync)
) )
] ]