diff --git a/android/third-party/native.gradle b/android/third-party/native.gradle index 682fa9bf5..a935c8360 100644 --- a/android/third-party/native.gradle +++ b/android/third-party/native.gradle @@ -181,7 +181,7 @@ task finalizeOpenSSL(dependsOn: [configureOpenSSL], type: Exec) { } task downloadRSocket(dependsOn: [], type: Download) { - src 'https://github.com/priteshrnandgaonkar/rsocket-cpp/archive/0.10.1.tar.gz' + src 'https://github.com/priteshrnandgaonkar/rsocket-cpp/archive/0.10.2.tar.gz' onlyIfNewer true overwrite false dest new File(downloadsDir, 'rsocket-' + getDownloadFileName(src)) @@ -190,7 +190,7 @@ task downloadRSocket(dependsOn: [], type: Download) { task prepareRSocket(dependsOn: [downloadRSocket], type: Copy) { from tarTree(downloadRSocket.dest) from './overrides/RSocket/' - include 'rsocket-cpp-0.10.1/**/*', 'build.gradle', 'ApplicationManifest.xml', 'CMakeLists.txt' + include 'rsocket-cpp-0.10.2/**/*', 'build.gradle', 'ApplicationManifest.xml', 'CMakeLists.txt' includeEmptyDirs = false into "$externalDir/RSocket" } diff --git a/android/third-party/overrides/RSocket/CMakeLists.txt b/android/third-party/overrides/RSocket/CMakeLists.txt index e7b47ab4e..d4bc0a673 100644 --- a/android/third-party/overrides/RSocket/CMakeLists.txt +++ b/android/third-party/overrides/RSocket/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_minimum_required (VERSION 3.6.0) PROJECT(rsocket CXX) set(PACKAGE_NAME rsocket) +set(RSOCKET_VERSION 0.10.2) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_EXTENSIONS OFF) @@ -13,8 +14,8 @@ set(LIBEVENT_DIR ${third_party_ndk}/LibEvent/libevent-release-2.1.9/) set(DOUBLECONVERSION_DIR ${third_party_ndk}/double-conversion/double-conversion-3.0.0/) set(OPENSSL_DIR ${third_party_ndk}/OpenSSL/openssl-1.1.0h/) -set(RSOCKET_ROOT_DIR ${PROJECT_SOURCE_DIR}/rsocket-cpp-0.10.1) -set(RSOCKET_DIR ${PROJECT_SOURCE_DIR}/rsocket-cpp-0.10.1/rsocket) +set(RSOCKET_ROOT_DIR ${PROJECT_SOURCE_DIR}/rsocket-cpp-${RSOCKET_VERSION}) +set(RSOCKET_DIR ${PROJECT_SOURCE_DIR}/rsocket-cpp-${RSOCKET_VERSION}/rsocket) list(APPEND dir_list ${RSOCKET_ROOT_DIR}/) list(APPEND dir_list ${RSOCKET_DIR}/) diff --git a/android/third-party/overrides/RSocket/build.gradle b/android/third-party/overrides/RSocket/build.gradle index 488db06a5..3213ca342 100644 --- a/android/third-party/overrides/RSocket/build.gradle +++ b/android/third-party/overrides/RSocket/build.gradle @@ -24,7 +24,6 @@ android { externalNativeBuild { cmake { path './CMakeLists.txt' - //'rsocket-cpp-0.10.0/CMakeLists.txt' } } } diff --git a/xplat/CMakeLists.txt b/xplat/CMakeLists.txt index b26c696e7..e0a8986dd 100644 --- a/xplat/CMakeLists.txt +++ b/xplat/CMakeLists.txt @@ -4,7 +4,7 @@ set(CMAKE_VERBOSE_MAKEFILE on) set(PACKAGE_NAME sonarcpp) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_EXTENSIONS OFF) - +set(RSOCKET_VERSION 0.10.2) set(external_DIR ${PROJECT_SOURCE_DIR}/../android/third-party/external) set(libfolly_DIR ${external_DIR}/folly/) set(rsocket_DIR ${external_DIR}/RSocket/) @@ -58,7 +58,7 @@ target_include_directories(${PACKAGE_NAME} PRIVATE ${BOOST_DIR} ${BOOST_DIR}/../ ${LIBEVENT_DIR}/ - ${rsocket_DIR}/rsocket-cpp-0.10.1 + ${rsocket_DIR}/rsocket-cpp-${RSOCKET_VERSION} ${LIBEVENT_DIR}/include/ ${LIBEVENT_DIR}/include/event2 ${OPENSSL_DIR}/include