diff --git a/iOS/Podfile.lock b/iOS/Podfile.lock index b3ef3b191..f4309de83 100644 --- a/iOS/Podfile.lock +++ b/iOS/Podfile.lock @@ -8,9 +8,9 @@ PODS: - CocoaLibEvent (~> 1.0) - DoubleConversion - glog - - OpenSSL-Universal (~> 1.0) + - OpenSSL-Static (= 1.0.2.c1) - glog (0.3.5) - - OpenSSL-Universal (1.0.2.13) + - OpenSSL-Static (1.0.2.c1) - PeerTalk (1.0.0) - RSocket (0.10.0): - Folly @@ -32,7 +32,7 @@ SPEC REPOS: - boost-for-react-native - CocoaAsyncSocket - CocoaLibEvent - - OpenSSL-Universal + - OpenSSL-Static EXTERNAL SOURCES: DoubleConversion: @@ -53,10 +53,10 @@ CHECKOUT OPTIONS: :commit: 588303b43efa5082d654b6f75d1b84a6ba4b5b9e :git: https://github.com/rsms/PeerTalk.git RSocket: - :commit: 193002818e53e7a7d73ee362627ddf1fdabc4493 + :commit: 89b368ce04d9b319593815c6a69ad0a681596146 :git: https://github.com/rsocket/rsocket-cpp.git Sonar: - :commit: 8d48f5a3eb26c6e982abefa30f5a8e0c19b5b4a6 + :commit: 03ffb3640a7ee21620fc62f9dcccb13b2f5af03c :git: https://github.com/facebook/Sonar.git SPEC CHECKSUMS: @@ -64,12 +64,12 @@ SPEC CHECKSUMS: CocoaAsyncSocket: eafaa68a7e0ec99ead0a7b35015e0bf25d2c8987 CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f DoubleConversion: 9bd61b1134a393694e95e0950c5bf3f99534817f - Folly: ce1c216bcb099ca6cda58fefbba02bf2e9fe0381 + Folly: 551752534f77d816ebf69195405d9d0fbd3efcc0 glog: fdb5d40eb83acd6a4d5d61d95ecc583f5970a119 - OpenSSL-Universal: 401888162f11c33ebbd46f782d9229da35c61327 + OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e PeerTalk: aadc42bc7d7f19e89f817b59ef8196305a711504 RSocket: e9ee232080f995ba8f403ccf4cb61238a5646cb6 - Sonar: 29d8fb9b010e56fa1358be996d68d4b436dd8c21 + Sonar: a7d8648c0536858abf352d481d57957adf01859b PODFILE CHECKSUM: a6a7b2201d324f787ef4956b045f021e7152fddf diff --git a/iOS/Sample/Podfile.lock b/iOS/Sample/Podfile.lock index 790647b0b..906438daa 100644 --- a/iOS/Sample/Podfile.lock +++ b/iOS/Sample/Podfile.lock @@ -115,10 +115,10 @@ CHECKOUT OPTIONS: :commit: 89b368ce04d9b319593815c6a69ad0a681596146 :git: https://github.com/rsocket/rsocket-cpp.git Sonar: - :commit: f1a3e6c1bdbae8df4fa787fb8f51a622baab0f5e + :commit: 03ffb3640a7ee21620fc62f9dcccb13b2f5af03c :git: https://github.com/facebook/Sonar.git SonarKit: - :commit: f1a3e6c1bdbae8df4fa787fb8f51a622baab0f5e + :commit: 03ffb3640a7ee21620fc62f9dcccb13b2f5af03c :git: https://github.com/facebook/Sonar.git SPEC CHECKSUMS: diff --git a/iOS/scripts/ios-configure-glog.sh b/iOS/scripts/ios-configure-glog.sh deleted file mode 100644 index e6a15febb..000000000 --- a/iOS/scripts/ios-configure-glog.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -set -e - -PLATFORM_NAME="${PLATFORM_NAME:-iphoneos}" -CURRENT_ARCH="${CURRENT_ARCH:-armv7}" - -export CC="$(xcrun -find -sdk $PLATFORM_NAME cc) -arch $CURRENT_ARCH -isysroot $(xcrun -sdk $PLATFORM_NAME --show-sdk-path)" -export CXX="$CC" - -# Remove automake symlink if it exists -if [ -h "test-driver" ]; then - rm test-driver -fi - -./configure --host arm-apple-darwin - -# Fix build for tvOS -cat << EOF >> src/config.h - -/* Add in so we have Apple Target Conditionals */ -#ifdef __APPLE__ -#include -#include -#endif - -/* Special configuration for AppleTVOS */ -#if TARGET_OS_TV -#undef HAVE_SYSCALL_H -#undef HAVE_SYS_SYSCALL_H -#undef OS_MACOSX -#endif - -/* Special configuration for ucontext */ -#undef HAVE_UCONTEXT_H -#undef PC_FROM_UCONTEXT -#if defined(__x86_64__) -#define PC_FROM_UCONTEXT uc_mcontext->__ss.__rip -#elif defined(__i386__) -#define PC_FROM_UCONTEXT uc_mcontext->__ss.__eip -#endif -EOF diff --git a/iOS/third-party-podspecs/glog.podspec b/iOS/third-party-podspecs/glog.podspec index e0dbd2f2d..3524ba47e 100755 --- a/iOS/third-party-podspecs/glog.podspec +++ b/iOS/third-party-podspecs/glog.podspec @@ -5,7 +5,7 @@ Pod::Spec.new do |spec| spec.homepage = 'https://github.com/google/glog' spec.summary = 'Google logging module' spec.authors = 'Google' - spec.prepare_command = File.read("../scripts/ios-configure-glog.sh") + spec.prepare_command = "#!/bin/bash\nset -e\n\nPLATFORM_NAME=\"${PLATFORM_NAME:-iphoneos}\"\nCURRENT_ARCH=\"${CURRENT_ARCH:-armv7}\"\n\nexport CC=\"$(xcrun -find -sdk $PLATFORM_NAME cc) -arch $CURRENT_ARCH -isysroot $(xcrun -sdk $PLATFORM_NAME --show-sdk-path)\"\nexport CXX=\"$CC\"\n\n# Remove automake symlink if it exists\nif [ -h \"test-driver\" ]; then\n rm test-driver\nfi\n\n./configure --host arm-apple-darwin\n\n# Fix build for tvOS\ncat << EOF >> src/config.h\n\n/* Add in so we have Apple Target Conditionals */\n#ifdef __APPLE__\n#include \n#include \n#endif\n\n/* Special configuration for AppleTVOS */\n#if TARGET_OS_TV\n#undef HAVE_SYSCALL_H\n#undef HAVE_SYS_SYSCALL_H\n#undef OS_MACOSX\n#endif\n\n/* Special configuration for ucontext */\n#undef HAVE_UCONTEXT_H\n#undef PC_FROM_UCONTEXT\n#if defined(__x86_64__)\n#define PC_FROM_UCONTEXT uc_mcontext->__ss.__rip\n#elif defined(__i386__)\n#define PC_FROM_UCONTEXT uc_mcontext->__ss.__eip\n#endif\nEOF" spec.source = { :git => 'https://github.com/google/glog.git', :tag => "v#{spec.version}" } spec.module_name = 'glog'