diff --git a/docs/contributing.html b/docs/contributing.html index 88ce12b33..b6e36c50b 100644 --- a/docs/contributing.html +++ b/docs/contributing.html @@ -756,6 +756,104 @@ window.addEventListener('scroll',changeHeaderBg);
MacOS comes with LibreSSL as default, OpenSSL must be installed to compile SimpleX from source.
OpenSSL can be installed with brew install openssl@1.1
You will have to add /opt/homebrew/opt/openssl@1.1/bin to your PATH in order to have things working properly
In simplex-chat repo
+stable - stable release of the apps, can be used for updates to the previous stable release (GHC 9.6.2).
stable-android - used to build stable Android core library with Nix (GHC 8.10.7).
stable-ios - used to build stable iOS core library with Nix (GHC 8.10.7) – this branch should be the same as stable-android except Nix configuration files.
master - branch for beta version releases (GHC 9.6.2).
master-android - used to build beta Android core library with Nix (GHC 8.10.7).
master-ios - used to build beta iOS core library with Nix (GHC 8.10.7) – this branch should be the same as master-android except Nix configuration files.
In simplexmq repo
+master - uses GHC 9.6.2 its commit should be used in master branch of simplex-chat repo.
master-ghc8107 - its commit should be used in master-android (and master-ios) branch of simplex-chat repo.
Make PRs to master branch only for both simplex-chat and simplexmq repos.
If simplexmq repo was changed, to build mobile core libraries you need to merge its master branch into master-ghc8107 branch.
To build Android core library:
+master branch to master-android branch.simplexmq commit in master-android branch to the commit in master-ghc8107 branch.To build iOS core library, merge master-android branch to master-ios branch, and push to GitHub.
To build Desktop and CLI apps, make tag in master branch, APK files should be attached to the release.
After the public release to App Store and Play Store, merge:
+master to stablemaster to master-android (and compile/update code)master-android to master-iosmaster-android to stable-androidmaster-ios to stable-iosmaster branch of simplexmq repo should be merged to stable branch on stable releases.DuplicateRecordFields extension.It is no longer possible in GHC 9.6.2 to specify type when using selectors, instead OverloadedRecordDot extension and syntax are used that need to be removed in GHC 8.10.7:
+{-# LANGUAGE DuplicateRecordFields #-}
+-- use this in GHC 9.6.2 when needed
+{-# LANGUAGE OverloadedRecordDot #-}
+
+-- GHC 9.6.2 syntax
+let x = record.field
+
+-- GHC 8.10.7 syntax removed in GHC 9.6.2
+let x = field (record :: Record)
+
+It is still possible to specify type when using record update syntax, use this pragma to suppress compiler warning:
+-- use this in GHC 9.6.2 when needed
+{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
+
+let r' = (record :: Record) {field = value}
+
+Control.Monad, and not from specific monad modules (e.g. Control.Monad.Except).-- use this in GHC 9.6.2 when needed
+import Control.Monad
+
+This PR has all the differences.
diff --git a/nl/index.html b/nl/index.html index 1ded7c695..cb41b2f7f 100644 --- a/nl/index.html +++ b/nl/index.html @@ -707,7 +707,7 @@ window.addEventListener('scroll',changeHeaderBg); Maak een privé verbinding- De video laat zien hoe je verbinding maakt met een vriend via een persoonlijk of video link eenmalige gedeelde QR-code. U kunt ook verbinding maken door een uitnodigingslink te delen. + De video laat zien hoe je verbinding maakt met een vriend via een persoonlijk of videolink gedeelde eenmalige QR-code. U kunt ook verbinding maken door een uitnodigingslink te delen.