simplex-chat · epoberezkin · Sep 18, 2023 · Aug 24, 2023 · Aug 25, 2023 · Aug 25, 2023
@@ -78,10 +78,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Haskell
-        uses: haskell/actions/setup@v2
+        uses: haskell-actions/setup@v2
         with:
-          ghc-version: "8.10.7"
-          cabal-version: "latest"
+          ghc-version: "9.6.2"
+          cabal-version: "3.10.1.0"
 
       - name: Cache dependencies
         uses: actions/cache@v3
@@ -171,8 +171,8 @@ jobs:
           APPLE_SIMPLEX_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_APPLE_ID }}
           APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }}
         run: |
-          scripts/desktop/build-desktop-mac-ci.sh
-          echo "::set-output name=package_path::$(echo $PWD/release/main/dmg/SimpleX-*.dmg)"
+          scripts/ci/build-desktop-mac.sh
+          echo "::set-output name=package_path::$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg)"
 
       - name: Linux upload desktop package to release
         if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
@@ -210,19 +210,18 @@ jobs:
       # Unix /
 
       # / Windows
-
-      # * In powershell multiline commands do not fail if individual commands fail - https://github.community/t/multiline-commands-on-windows-do-not-fail-if-individual-commands-fail/16753
-      # * And GitHub Actions does not support parameterizing shell in a matrix job - https://github.community/t/using-matrix-to-specify-shell-is-it-possible/17065
+      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
 
       - name: Windows build
         id: windows_build
         if: matrix.os == 'windows-latest'
-        shell: cmd
+        shell: bash
         run: |
+          rm -rf dist-newstyle/src/direct-sq*
+          sed -i "s/, unix /--, unix /" simplex-chat.cabal
           cabal build --enable-tests
-          cabal list-bin simplex-chat > tmp_bin_path
-          set /p bin_path= < tmp_bin_path
-          echo ::set-output name=bin_path::%bin_path%
+          rm -rf dist-newstyle/src/direct-sq*
+          echo "::set-output name=bin_path::$(cabal list-bin simplex-chat | tail -n 1)"
 
       - name: Windows upload binary to release
         if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'

@@ -67,7 +67,7 @@ if(NOT APPLE)
 else()
 	# Without direct linking it can't find hs_init in linking step
 	add_library( rts SHARED IMPORTED )
-	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/deps/libHSrts_thr-*.${OS_LIB_EXT})
+	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/deps/libHSrts*_thr-*.${OS_LIB_EXT})
 	set_target_properties( rts PROPERTIES IMPORTED_LOCATION ${RTSLIB})
 
 	target_link_libraries(app-lib rts simplex)

@@ -8,7 +8,7 @@ module Main where
 
 import Control.Concurrent.Async
 import Control.Concurrent.STM
-import Control.Monad.Reader
+import Control.Monad
 import qualified Data.Text as T
 import Simplex.Chat.Bot
 import Simplex.Chat.Controller

@@ -9,7 +9,7 @@ module Broadcast.Bot where
 import Control.Concurrent (forkIO)
 import Control.Concurrent.Async
 import Control.Concurrent.STM
-import Control.Monad.Reader
+import Control.Monad
 import qualified Data.Text as T
 import Broadcast.Options
 import Simplex.Chat.Bot

@@ -8,6 +8,7 @@
 
 module Server where
 
+import Control.Monad
 import Control.Monad.Except
 import Control.Monad.Reader
 import Data.Aeson (FromJSON, ToJSON)

@@ -15,7 +15,7 @@ where
 import Control.Concurrent (forkIO)
 import Control.Concurrent.Async
 import Control.Concurrent.STM
-import Control.Monad.Reader
+import Control.Monad
 import qualified Data.ByteString.Char8 as B
 import Data.List (sortOn)
 import Data.Maybe (fromMaybe, maybeToList)

@@ -2,14 +2,14 @@ packages: .
 -- packages: . ../simplexmq
 -- packages: . ../simplexmq ../direct-sqlcipher ../sqlcipher-simple
 
-with-compiler: ghc-8.10.7
+with-compiler: ghc-9.6.2
 
 constraints: zip +disable-bzip2 +disable-zstd
 
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: 0cabe0690beee90f460ad7bada72294222e7e109
+    tag: 81385e39bf5d953ec7f85e6e82014672239c3520
 
 source-repository-package
     type: git
@@ -24,17 +24,17 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/direct-sqlcipher.git
-    tag: 34309410eb2069b029b8fc1872deb1e0db123294
+    tag: f814ee68b16a9447fbb467ccc8f29bdd3546bfd9
 
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/sqlcipher-simple.git
-    tag: 5e154a2aeccc33ead6c243ec07195ab673137221
+    tag: a46bd361a19376c5211f1058908fc0ae6bf42446
 
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/aeson.git
-    tag: 3eb66f9a68f103b5f1489382aad89f5712a64db7
+    tag: 68330dce8208173c6acf5f62b23acb500ab5d873
 
 source-repository-package
     type: git
@@ -43,5 +43,10 @@ source-repository-package
 
 source-repository-package
     type: git
-    location: https://github.com/zw3rk/android-support.git
-    tag: 3c3a5ab0b8b137a072c98d3d0937cbdc96918ddb
+    location: https://github.com/simplex-chat/android-support.git
+    tag: 9aa09f148089d6752ce563b14c2df1895718d806
+
+source-repository-package
+    type: git
+    location: https://github.com/simplex-chat/network-transport.git
+    tag: 0013798272a683e35ca38d2fdaf480942311fba8
@@ -13,25 +13,25 @@ extra-source-files:
   - cabal.project
 
 dependencies:
-  - aeson == 2.0.*
+  - aeson == 2.2.*
   - ansi-terminal >= 0.10 && < 0.12
   - async == 2.2.*
   - attoparsec == 0.14.*
   - base >= 4.7 && < 5
   - base64-bytestring >= 1.0 && < 1.3
-  - bytestring == 0.10.*
+  - bytestring == 0.11.*
   - composition == 1.0.*
   - constraints >= 0.12 && < 0.14
   - containers == 0.6.*
-  - cryptonite >= 0.27 && < 0.30
+  - cryptonite == 0.30.*
   - directory == 1.3.*
   - direct-sqlcipher == 2.3.*
   - email-validate == 2.3.*
   - exceptions == 0.10.*
   - filepath == 1.4.*
   - http-types == 0.12.*
-  - memory == 0.15.*
-  - mtl == 2.2.*
+  - memory == 0.18.*
+  - mtl == 2.3.*
   - network >= 3.1.2.7 && < 3.2
   - optparse-applicative >= 0.15 && < 0.17
   - process == 1.6.*
@@ -42,13 +42,14 @@ dependencies:
   - socks == 0.6.*
   - sqlcipher-simple == 0.4.*
   - stm == 2.5.*
-  - template-haskell == 2.16.*
+  - template-haskell == 2.20.*
   - terminal == 0.2.*
-  - text == 1.2.*
+  - text == 2.0.*
   - time == 1.9.*
+  - unix == 2.8.1.1
   - unliftio == 0.2.*
   - unliftio-core == 0.2.*
-  - zip == 1.7.*
+  - zip == 2.0.*
 
 flags:
   swift:
@@ -118,7 +119,7 @@ tests:
       - simplex-chat
       - async == 2.2.*
       - deepseq == 1.4.*
-      - hspec == 2.7.*
+      - hspec == 2.11.*
       - network == 3.1.*
       - silently == 1.2.*
       - stm == 2.5.*

@@ -2,14 +2,18 @@
 
 set -e
 
-trap "rm apps/multiplatform/local.properties || true; rm local.properties || true; rm /tmp/simplex.keychain || true" EXIT
+trap "rm apps/multiplatform/local.properties 2> /dev/null || true; rm local.properties 2> /dev/null || true; rm /tmp/simplex.keychain" EXIT
 echo "desktop.mac.signing.identity=Developer ID Application: SimpleX Chat Ltd (5NN7GUYB6T)" >> apps/multiplatform/local.properties
 echo "desktop.mac.signing.keychain=/tmp/simplex.keychain" >> apps/multiplatform/local.properties
 echo "desktop.mac.notarization.apple_id=$APPLE_SIMPLEX_NOTARIZATION_APPLE_ID" >> apps/multiplatform/local.properties
 echo "desktop.mac.notarization.password=$APPLE_SIMPLEX_NOTARIZATION_PASSWORD" >> apps/multiplatform/local.properties
 echo "desktop.mac.notarization.team_id=5NN7GUYB6T" >> apps/multiplatform/local.properties
 echo "$APPLE_SIMPLEX_SIGNING_KEYCHAIN" | base64 --decode - > /tmp/simplex.keychain
 
+security unlock-keychain -p "" /tmp/simplex.keychain
+# Adding keychain to the list of keychains.
+# Otherwise, it can find cert but exits while signing with "error: The specified item could not be found in the keychain."
+security list-keychains -s `security list-keychains | xargs` /tmp/simplex.keychain
 scripts/desktop/build-lib-mac.sh
 cd apps/multiplatform
 ./gradlew packageDmg

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+security create-keychain -p "" simplex.keychain
+security set-keychain-settings -u simplex.keychain
+security add-certificates -k simplex.keychain "Developer ID Application: SimpleX Chat Ltd (5NN7GUYB6T).cer"
+security add-certificates -k simplex.keychain "Developer ID Certification Authority.cer"
+# Private key with access from any app
+security import "SimpleX Chat.p12" -P "" -k simplex.keychain -A
+# Public key
+security import "SimpleX Chat.pem" -k simplex.keychain
@@ -2,12 +2,12 @@
 
 OS=linux
 ARCH=${1:-`uname -a | rev | cut -d' ' -f2 | rev`}
-GHC_VERSION=8.10.7
+GHC_VERSION=9.6.2
 
 BUILD_DIR=dist-newstyle/build/$ARCH-$OS/ghc-${GHC_VERSION}/simplex-chat-*
 
 rm -rf $BUILD_DIR
-cabal build lib:simplex-chat --ghc-options='-optl-Wl,-rpath,$ORIGIN' --ghc-options="-optl-L$(ghc --print-libdir)/rts -optl-Wl,--as-needed,-lHSrts_thr-ghc$GHC_VERSION"
+cabal build lib:simplex-chat --ghc-options='-optl-Wl,-rpath,$ORIGIN -flink-rts -threaded'
 cd $BUILD_DIR/build
 #patchelf --add-needed libHSrts_thr-ghc${GHC_VERSION}.so libHSsimplex-chat-*-inplace-ghc${GHC_VERSION}.so
 #patchelf --add-rpath '$ORIGIN' libHSsimplex-chat-*-inplace-ghc${GHC_VERSION}.so

@@ -2,23 +2,39 @@
 
 OS=mac
 ARCH="${1:-`uname -a | rev | cut -d' ' -f1 | rev`}"
+GHC_VERSION=9.6.2
+
 if [ "$ARCH" == "arm64" ]; then
     ARCH=aarch64
 fi
+
 LIB_EXT=dylib
 LIB=libHSsimplex-chat-*-inplace-ghc*.$LIB_EXT
 GHC_LIBS_DIR=$(ghc --print-libdir)
 
 BUILD_DIR=dist-newstyle/build/$ARCH-*/ghc-*/simplex-chat-*
 
 rm -rf $BUILD_DIR
-cabal build lib:simplex-chat lib:simplex-chat --ghc-options="-optl-Wl,-rpath,@loader_path -optl-Wl,-L$GHC_LIBS_DIR/rts -optl-lHSrts_thr-ghc8.10.7 -optl-lffi"
+cabal build lib:simplex-chat lib:simplex-chat --ghc-options="-optl-Wl,-rpath,@loader_path -optl-Wl,-L$GHC_LIBS_DIR/$ARCH-osx-ghc-$GHC_VERSION -optl-lHSrts_thr-ghc$GHC_VERSION -optl-lffi"
 
 cd $BUILD_DIR/build
 mkdir deps 2> /dev/null
 
 # It's not included by default for some reason. Compiled lib tries to find system one but it's not always available
-cp $GHC_LIBS_DIR/rts/libffi.dylib ./deps
+#cp $GHC_LIBS_DIR/libffi.dylib ./deps
+(
+  BUILD=$PWD
+  cp /tmp/libffi-3.4.4/*-apple-darwin*/.libs/libffi.dylib $BUILD/deps || \
+    ( \
+    cd /tmp && \
+    curl "https://gitlab.haskell.org/ghc/libffi-tarballs/-/raw/libffi-3.4.4/libffi-3.4.4.tar.gz?inline=false" -o libffi.tar.gz && \
+    tar -xzvf libffi.tar.gz && \
+    cd "libffi-3.4.4" && \
+    ./configure && \
+    make && \
+    cp *-apple-darwin*/.libs/libffi.dylib $BUILD/deps \
+    )
+)
 
 DYLIBS=`otool -L $LIB | grep @rpath | tail -n +2 | cut -d' ' -f 1 | cut -d'/' -f2`
 RPATHS=`otool -l $LIB | grep "path "| cut -d' ' -f11`
@@ -59,11 +75,13 @@ function copy_deps() {
 }
 
 copy_deps $LIB
+# Special case
+cp $(ghc --print-libdir)/$ARCH-osx-ghc-$GHC_VERSION/libHSghc-boot-th-$GHC_VERSION-ghc$GHC_VERSION.dylib deps
 rm deps/`basename $LIB`
 
 if [ -e deps/libHSdrct-*.$LIB_EXT ]; then
     LIBCRYPTO_PATH=$(otool -l deps/libHSdrct-*.$LIB_EXT | grep libcrypto | cut -d' ' -f11)
-    install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.1.1.$LIB_EXT deps/libHSdrct*.$LIB_EXT
+    install_name_tool -change $LIBCRYPTO_PATH @rpath/libcrypto.1.1.$LIB_EXT deps/libHSdrct-*.$LIB_EXT
     cp $LIBCRYPTO_PATH deps/libcrypto.1.1.$LIB_EXT
     chmod 755 deps/libcrypto.1.1.$LIB_EXT
 fi

@@ -1,10 +1,11 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."0cabe0690beee90f460ad7bada72294222e7e109" = "1yfcrifb2l59wgl14q56ywlil2g2zs57ic62s617whh3w2mnh0kz";
+  "https://github.com/simplex-chat/simplexmq.git"."81385e39bf5d953ec7f85e6e82014672239c3520" = "1mdfi6w0w6zqrlycxcziwl29bvqrq07ing6czax8mf66b656lr21";
   "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
   "https://github.com/kazu-yamamoto/http2.git"."b5a1b7200cf5bc7044af34ba325284271f6dff25" = "0dqb50j57an64nf4qcf5vcz4xkd1vzvghvf8bk529c1k30r9nfzb";
-  "https://github.com/simplex-chat/direct-sqlcipher.git"."34309410eb2069b029b8fc1872deb1e0db123294" = "0kwkmhyfsn2lixdlgl15smgr1h5gjk7fky6abzh8rng2h5ymnffd";
-  "https://github.com/simplex-chat/sqlcipher-simple.git"."5e154a2aeccc33ead6c243ec07195ab673137221" = "1d1gc5wax4vqg0801ajsmx1sbwvd9y7p7b8mmskvqsmpbwgbh0m0";
-  "https://github.com/simplex-chat/aeson.git"."3eb66f9a68f103b5f1489382aad89f5712a64db7" = "0kilkx59fl6c3qy3kjczqvm8c3f4n3p0bdk9biyflf51ljnzp4yp";
+  "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "0kiwhvml42g9anw4d2v0zd1fpc790pj9syg5x3ik4l97fnkbbwpp";
+  "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";
+  "https://github.com/simplex-chat/aeson.git"."68330dce8208173c6acf5f62b23acb500ab5d873" = "1l51p1v54c88c1jmxcvbz4gy0cns7l46ihzzfjwxxrvcrrrxgcjp";
   "https://github.com/simplex-chat/haskell-terminal.git"."f708b00009b54890172068f168bf98508ffcd495" = "0zmq7lmfsk8m340g47g5963yba7i88n4afa6z93sg9px5jv1mijj";
-  "https://github.com/zw3rk/android-support.git"."3c3a5ab0b8b137a072c98d3d0937cbdc96918ddb" = "1r6jyxbim3dsvrmakqfyxbd6ms6miaghpbwyl0sr6dzwpgaprz97";
+  "https://github.com/simplex-chat/android-support.git"."9aa09f148089d6752ce563b14c2df1895718d806" = "0pbf2pf13v2kjzi397nr13f1h3jv0imvsq8rpiyy2qyx5vd50pqn";
+  "https://github.com/simplex-chat/network-transport.git"."0013798272a683e35ca38d2fdaf480942311fba8" = "0dnn62apgvc248df0m8ib7phrzn63wm0xs71xvlypv52j6cgwzkb";
 }