From 299c44afefc524c2f627855536203bc94d94f16b Mon Sep 17 00:00:00 2001 From: Vitaliy Vlasov Date: Tue, 16 Oct 2018 16:06:52 +0300 Subject: [PATCH] Use STATUS_GO_VERSION for desktop Fix path extractGroupMembershipSignatures -> verifyGroupMembershipSignatures Minor Use release link instead of git url Fix Signed-off-by: yenda --- desktop_files/package-lock.json | 4 ++-- modules/react-native-status/desktop/CMakeLists.txt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/desktop_files/package-lock.json b/desktop_files/package-lock.json index 48eb33d869..8cca84ae25 100644 --- a/desktop_files/package-lock.json +++ b/desktop_files/package-lock.json @@ -11557,7 +11557,7 @@ } }, "react-native": { - "version": "git+https://github.com/status-im/react-native-desktop.git#67a4c72a9353ebd589492f08218b218bc020997a", + "version": "git+https://github.com/status-im/react-native-desktop.git#master", "requires": { "absolute-path": "0.0.0", "art": "0.10.3", @@ -12087,7 +12087,7 @@ "dependencies": { "file-type": { "version": "3.9.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", + "resolved": "http://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" } } diff --git a/modules/react-native-status/desktop/CMakeLists.txt b/modules/react-native-status/desktop/CMakeLists.txt index 7b9aacf243..aa53ca09d2 100755 --- a/modules/react-native-status/desktop/CMakeLists.txt +++ b/modules/react-native-status/desktop/CMakeLists.txt @@ -33,12 +33,12 @@ else() set(CONFIGURE_SCRIPT build-status-go.sh) endif() +file (STRINGS "../../../STATUS_GO_VERSION" STATUS_GO_VERSION) + ExternalProject_Add(StatusGo_ep PREFIX ${StatusGo_PREFIX} SOURCE_DIR ${StatusGo_SOURCE_DIR} - GIT_REPOSITORY https://github.com/status-im/status-go.git - GIT_TAG c86f8bf6ca35280e7041674f76a2ef1fe333e482 - + URL https://github.com/status-im/status-go/archive/v${STATUS_GO_VERSION}.zip BUILD_BYPRODUCTS ${StatusGo_STATIC_LIB} CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${CONFIGURE_SCRIPT} ${GO_ROOT_PATH} ${StatusGo_ROOT} ${StatusGo_SOURCE_DIR} BUILD_COMMAND ""