From 208d82c6d0648c9e1d05be69085586652d831d0c Mon Sep 17 00:00:00 2001 From: Thomas Walther Date: Sat, 11 Mar 2023 15:02:17 +0100 Subject: [PATCH] Remove CocoaPods support --- .travis.yml | 8 ----- README.md | 8 ++--- librocksdb.podspec | 78 ------------------------------------------- rocksdb.swift.podspec | 33 ------------------ 4 files changed, 3 insertions(+), 124 deletions(-) delete mode 100644 librocksdb.podspec delete mode 100644 rocksdb.swift.podspec diff --git a/.travis.yml b/.travis.yml index 89109ab..b7c8f34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,12 +15,8 @@ sudo: required osx_image: xcode11.2 xcode_sdk: iphonesimulator13.2 -# cache: cocoapods -# podfile: Example/Podfile before_install: - if [ $TRAVIS_OS_NAME == "osx" ]; then instruments -s devices; fi - - if [ $TRAVIS_OS_NAME == "osx" ]; then gem install cocoapods; fi # Since Travis is not always on latest version - - if [ $TRAVIS_OS_NAME == "osx" ]; then pod repo update; fi - | if [ $TRAVIS_OS_NAME == "osx" ]; then echo "macOS build. swiftenv will not be installed."; @@ -36,10 +32,6 @@ script: # Output something every 10 minutes or Travis kills the job - while sleep 60; do echo "=====[ $SECONDS seconds still running ]====="; done & # Actual script - - | - if [ $TRAVIS_OS_NAME == "osx" ]; then - pod spec lint --allow-warnings librocksdb.podspec; - fi - swift build - swift build -c release - | diff --git a/README.md b/README.md index e4045e4..d1e6e38 100644 --- a/README.md +++ b/README.md @@ -12,11 +12,9 @@ You can use this library with Swift Package Manager and Cocoapods on iOS, macOS, ### CocoaPods -RocksDB is available through [CocoaPods](http://cocoapods.org/). To install it, simply add the following line to your Podfile: - -```Ruby -pod 'rocksdb.swift' -``` +koraykoska's version has support for CocoaPods, but this fork doesn't. If you require it, it should be relatively +straightforward to add by diffing the changes this fork has done to Package.swift with koraykoska's branch and changing +the podspec files accordingly. ### Swift Package Manager diff --git a/librocksdb.podspec b/librocksdb.podspec deleted file mode 100644 index e80ba80..0000000 --- a/librocksdb.podspec +++ /dev/null @@ -1,78 +0,0 @@ -Pod::Spec.new do |s| - s.name = 'librocksdb' - s.version = '6.4.16' - s.summary = 'rocksdb bindings for Swift. Cocoapods and SPM support. Linux support.' - - s.description = <<-DESC -This pod incldues bindings for the awesome rocksdb structured key value database from facebook. -Works on iOS, macOS, tvOS, watchOS and Linux. Major and Minor Version numbers are kept in sync with -the upstream rocksdb library. Patch version varies. - DESC - - s.homepage = 'https://github.com/TapeIt/rocksdb.swift' - s.license = { :type => 'MIT', :file => 'LICENSE' } - s.author = { 'Koray Koska' => 'koray@koska.at' } - s.source = { :git => 'https://github.com/TapeIt/rocksdb.swift.git', :tag => "v#{s.version.to_s}", :submodules => true } - - s.ios.deployment_target = '8.0' - s.osx.deployment_target = '10.10' - s.tvos.deployment_target = '9.0' - s.watchos.deployment_target = '2.0' - - s.swift_versions = '5.1.3', '5.1.2', '5.0', '5.1' - - s.module_name = 'librocksdb' - - s.pod_target_xcconfig = { - 'GCC_PREPROCESSOR_DEFINITIONS' => 'ROCKSDB_PLATFORM_POSIX=1 ROCKSDB_LIB_IO_POSIX=1 PORTABLE=1 OS_MACOSX=1 ROCKSDB_BUILD_GIT_SHA_ENV=\"e3169e3ea8762d2f34880742106858a23c8dc8b7\" ROCKSDB_BUILD_GIT_DATE_ENV="\"Mon Oct 21 12:07:58 2019 -0700\""', - 'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/librocksdb/Sources/librocksdb/upstream" "${PODS_ROOT}/librocksdb/Sources/librocksdb/upstream/include" "${PODS_ROOT}/librocksdb/Sources/librocksdb/upstream/util"', - 'WARNING_CFLAGS' => '-Wno-shorten-64-to-32 -Wno-comma -Wno-unreachable-code -Wno-conditional-uninitialized -Wno-deprecated-declarations', - 'USE_HEADERMAP' => 'No' - } - - # s.header_dir = 'rocksdb' - s.header_mappings_dir = 'Sources/librocksdb' - - s.libraries = 'c++' - - s.source_files = 'Sources/librocksdb/upstream/cache/**/*.{cc,c,h}', - 'Sources/librocksdb/upstream/db/**/*.{cc,c,h}', - 'Sources/librocksdb/upstream/env/**/*.{cc,c,h}', - 'Sources/librocksdb/upstream/file/**/*.{cc,c,h}', - 'Sources/librocksdb/upstream/include/**/*.{cc,c,h}', - 'Sources/librocksdb/upstream/logging/**/*.{cc,c,h}', - 'Sources/librocksdb/upstream/memory/**/*.{cc,c,h}', - 'Sources/librocksdb/upstream/memtable/**/*.{cc,c,h}', - 'Sources/librocksdb/upstream/monitoring/**/*.{cc,c,h}', - 'Sources/librocksdb/upstream/options/**/*.{cc,c,h}', - 'Sources/librocksdb/upstream/port/**/*.{cc,c,h}', - 'Sources/librocksdb/upstream/table/**/*.{cc,c,h}', - 'Sources/librocksdb/upstream/test_util/**/*.{cc,c,h}', - 'Sources/librocksdb/upstream/trace_replay/**/*.{cc,c,h}', - 'Sources/librocksdb/upstream/util/**/*.{cc,c,h}', - 'Sources/librocksdb/upstream/utilities/**/*.{cc,c,h}', - 'Sources/librocksdb/upstream/tools/sst_dump_tool_imp.h', - 'Sources/librocksdb/patches/build_version.cc' - s.public_header_files = 'Sources/librocksdb/upstream/include/rocksdb/c.h' - # s.private_header_files = 'Sources/librocksdb/upstream/**/*.h' - s.exclude_files = '**/*_test.{cc,c}', - '**/*_bench.cc', - 'Sources/librocksdb/upstream/db/db_test2.cc', - 'Sources/librocksdb/upstream/db/db_test_util.cc', - 'Sources/librocksdb/upstream/port/win', - 'Sources/librocksdb/upstream/table/mock_table.h', - 'Sources/librocksdb/upstream/table/mock_table.cc', - 'Sources/librocksdb/upstream/test_util/testharness.cc', - 'Sources/librocksdb/upstream/test_util/testharness.h', - 'Sources/librocksdb/upstream/util/crc32c_ppc_asm.S', - 'Sources/librocksdb/upstream/utilities/env_librados.cc', - 'Sources/librocksdb/upstream/utilities/cassandra/test_utils.cc', - 'Sources/librocksdb/upstream/utilities/cassandra/test_utils.h', - 'Sources/librocksdb/upstream/utilities/cassandra/merge_operator.cc', - 'Sources/librocksdb/upstream/utilities/cassandra/merge_operator.h', - 'Sources/librocksdb/upstream/utilities/cassandra/format.cc', - 'Sources/librocksdb/upstream/utilities/cassandra/format.h', - 'Sources/librocksdb/upstream/utilities/cassandra/cassandra_compaction_filter.cc', - 'Sources/librocksdb/upstream/utilities/cassandra/cassandra_compaction_filter.h', - 'Sources/librocksdb/upstream/env/env_hdfs.cc' -end diff --git a/rocksdb.swift.podspec b/rocksdb.swift.podspec deleted file mode 100644 index 300cc0b..0000000 --- a/rocksdb.swift.podspec +++ /dev/null @@ -1,33 +0,0 @@ -Pod::Spec.new do |s| - s.name = 'rocksdb.swift' - s.version = '6.4.16' - s.summary = 'rocksdb Wrapper for Swift. Cocoapods and SPM support. Linux support.' - - s.description = <<-DESC -This pod wraps the awesome rocksdb key-value database from facebook to awesome Swifty Syntax. -Works on iOS, macOS, tvOS, watchOS and Linux. Major and Minor Version numbers are kept in sync with -the upstream rocksdb library. Patch version varies. - DESC - - s.homepage = 'https://github.com/TapeIt/rocksdb.swift' - s.license = { :type => 'MIT', :file => 'LICENSE' } - s.author = { 'Koray Koska' => 'koray@koska.at' } - s.source = { :git => 'https://github.com/TapeIt/rocksdb.swift.git', :tag => "v#{s.version.to_s}" } - - s.ios.deployment_target = '8.0' - s.osx.deployment_target = '10.10' - s.tvos.deployment_target = '9.0' - s.watchos.deployment_target = '2.0' - - s.dependency 'librocksdb', '~> 6.4.16' - - s.swift_versions = '5.1.3', '5.1.2', '5.0', '5.1' - - s.module_name = 'RocksDB' - - # s.pod_target_xcconfig = { - # 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES' - # } - - s.source_files = 'Sources/RocksDB/**/*.swift' -end