jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update rsocket version

Browse Source 
Summary: Updates rsocket version

Reviewed By: passy

Differential Revision: D9769468

fbshipit-source-id: b822e697446b1464b63206869726e0e086438134
This commit is contained in:
Pritesh Nandgaonkar
2018-09-13 03:01:34 -07:00
committed by Facebook Github Bot
parent 27cbf7f995
commit 9a16d9cbad
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/third-party/native.gradle vendored
View File

@@ -4,7 +4,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
// Increment this when making changes to any of the native // Increment this when making changes to any of the native
// dependencies. // dependencies.
// !!! // !!!
final def CACHE_REVISION = 1 final def CACHE_REVISION = 2
final def externalDir = new File("$projectDir/external") final def externalDir = new File("$projectDir/external")
final def downloadsDir = new File("$buildDir/downloads") final def downloadsDir = new File("$buildDir/downloads")
@@ -202,7 +202,7 @@ task finalizeOpenSSL(dependsOn: [configureOpenSSL], type: Exec) {
} }
task downloadRSocket(dependsOn: [], type: Download) { task downloadRSocket(dependsOn: [], type: Download) {
src 'https://github.com/priteshrnandgaonkar/rsocket-cpp/archive/0.10.2.tar.gz' src 'https://github.com/priteshrnandgaonkar/rsocket-cpp/archive/0.10.3.tar.gz'
onlyIfNewer true onlyIfNewer true
overwrite false overwrite false
dest new File(downloadsDir, 'rsocket-' + getDownloadFileName(src)) dest new File(downloadsDir, 'rsocket-' + getDownloadFileName(src))
@@ -211,7 +211,7 @@ task downloadRSocket(dependsOn: [], type: Download) {
task prepareRSocket(dependsOn: [downloadRSocket], type: Copy) { task prepareRSocket(dependsOn: [downloadRSocket], type: Copy) {
from tarTree(downloadRSocket.dest) from tarTree(downloadRSocket.dest)
from './overrides/RSocket/' from './overrides/RSocket/'
include 'rsocket-cpp-0.10.2/**/*', 'build.gradle', 'ApplicationManifest.xml', 'CMakeLists.txt' include 'rsocket-cpp-0.10.3/**/*', 'build.gradle', 'ApplicationManifest.xml', 'CMakeLists.txt'
includeEmptyDirs = false includeEmptyDirs = false
into "$externalDir/RSocket" into "$externalDir/RSocket"
} }

2
android/third-party/overrides/RSocket/CMakeLists.txt vendored
View File

@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.6.0)
PROJECT(rsocket CXX) PROJECT(rsocket CXX)
set(PACKAGE_NAME rsocket) set(PACKAGE_NAME rsocket)
set(RSOCKET_VERSION 0.10.2) set(RSOCKET_VERSION 0.10.3)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)

2
xplat/CMakeLists.txt
View File

@@ -4,7 +4,7 @@ set(CMAKE_VERBOSE_MAKEFILE on)
set(PACKAGE_NAME sonarcpp) set(PACKAGE_NAME sonarcpp)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(RSOCKET_VERSION 0.10.2) set(RSOCKET_VERSION 0.10.3)
set(external_DIR ${PROJECT_SOURCE_DIR}/../android/third-party/external) set(external_DIR ${PROJECT_SOURCE_DIR}/../android/third-party/external)
set(libfolly_DIR ${external_DIR}/folly/) set(libfolly_DIR ${external_DIR}/folly/)
set(rsocket_DIR ${external_DIR}/RSocket/) set(rsocket_DIR ${external_DIR}/RSocket/)