Skip to content

Commit a2b6a4d

Browse files
committed
Merge branch 'release/0.7.0'
2 parents 6e02f05 + f26a870 commit a2b6a4d

File tree

105 files changed

+2584
-3137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+2584
-3137
lines changed

.travis.yml

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,35 @@
11
language: objective-c
2-
osx_image: xcode7.3
2+
osx_image: xcode8.2
3+
4+
branches:
5+
except:
6+
- gh-pages
7+
8+
install:
9+
- gem install xcpretty
10+
11+
env:
12+
global:
13+
- LC_CTYPE=en_US.UTF-8
14+
- LANG=en_US.UTF-8
15+
- WORKSPACE=ObjectiveRocks.xcworkspace
16+
- IOS_FRAMEWORK_SCHEME=ObjectiveRocks-iOS
17+
- MACOS_FRAMEWORK_SCHEME=ObjectiveRocks
18+
- IOS_SDK=iphonesimulator10.2
19+
- MACOS_SDK=macosx10.12
20+
matrix:
21+
- DESTINATION="arch=x86_64" SIMULATOR="" SCHEME="$MACOS_FRAMEWORK_SCHEME" SDK="$MACOS_SDK"
22+
- DESTINATION="OS=9.0,name=iPhone 6" SIMULATOR="iPhone 6 (9.0)" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK"
23+
- DESTINATION="OS=9.1,name=iPhone 6 Plus" SIMULATOR="iPhone 6 Plus (9.1)" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK"
24+
- DESTINATION="OS=9.2,name=iPhone 6S" SIMULATOR="iPhone 6S (9.2)" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK"
25+
- DESTINATION="OS=9.3,name=iPhone 6S Plus" SIMULATOR="iPhone 6S Plus (9.3)" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK"
26+
- DESTINATION="OS=10.1,name=iPhone 7 Plus" SIMULATOR="iPhone 7 Plus (10.1)" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK"
27+
328
script:
4-
- xcodebuild -project ObjectiveRocks.xcodeproj -scheme ObjectiveRocks -sdk macosx ONLY_ACTIVE_ARCH=NO
5-
- xcodebuild test -project ObjectiveRocks.xcodeproj -scheme ObjectiveRocksTests -sdk macosx ONLY_ACTIVE_ARCH=NO
6-
- xcodebuild -project ObjectiveRocks.xcodeproj -scheme ObjectiveRocks-iOS -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO
7-
- xcodebuild test -project ObjectiveRocks.xcodeproj -scheme ObjectiveRocksTests-iOS -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO
29+
- set -o pipefail
30+
- xcodebuild -version
31+
- xcodebuild -showsdks
32+
- SIMULATOR_ID=$(xcrun instruments -s devices | grep -io "$SIMULATOR \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
33+
- open -b com.apple.iphonesimulator --args -CurrentDeviceUDID $SIMULATOR_ID
34+
- travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean build | xcpretty -c
35+
- travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c;

CHANGELOG.md

Lines changed: 61 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,59 @@
11
# Change Log
22

3+
## [0.7.0](https://github.com/iabudiab/ObjectiveRocks/releases/tag/0.7.0)
4+
5+
Released on 2017.02.19
6+
7+
- RocksDB Version: `4.6.1`: [facebook/rocksdb@8d7926a](https://github.com/facebook/rocksdb/commit/8d7926a766f2ab9bd6e7aa8cba80b5d3ff26c52b)
8+
9+
### Added
10+
11+
- Missing nullability annotations and light-weight generics throughout code base
12+
- New playground content
13+
14+
### Updated
15+
16+
- Project for Xcode 8
17+
- Swift tests for Swift 3
18+
- Playground contents and syntax for Swift 3
19+
- Travis config for iOS 10.2, macOS 10.12
20+
- Deployment targets to macOS 10.10, iOS 9.0
21+
22+
### Removed
23+
24+
- Removed the deprecated `timeoutHint` option
25+
- Removed the deprecated `maxMemCompactionLevel` option
26+
27+
### Breaking Changes
28+
29+
The built-in encoding/decoding of keys and values via the encoding options is completelty removed from this release. The API is completely `NSData`-based now.
30+
31+
- Removed built-it Key/Value `Encoders` and `Decoders`
32+
- The conversions of custom types to/from `NSData` is the responsibility of the caller
33+
- Removed `EncodingOptions`
34+
- Removed all methods depending on `EncodingOptions` and the built-in key/value `encoding` and all of the their variants:
35+
- `setObject:forKey:`
36+
- `deleteObjectForKey:`
37+
- `objectForKey:`
38+
- `mergeObject:forKey:`
39+
- `mergeOperation:forKey:`
40+
- Refactored all `Iterator`, `Key Comparator` and `Merge Operator` methods accordingly
41+
- Removed `NSNumber` Key-Comparators
42+
- Rename method for setting up default read & write options from `setDefaultReadOptions:andWriteOptions:` to `setDefaultReadOptions:writeOptions:`
43+
- The custom Swift equivalent is `setDefault(readOptions:writeOptions:)`
44+
45+
46+
## [0.6.0](https://github.com/iabudiab/ObjectiveRocks/releases/tag/0.6.0)
47+
48+
Released on 2016.06.12
49+
50+
- RocksDB Version: `4.6.1`: [facebook/rocksdb@8d7926a](https://github.com/facebook/rocksdb/commit/8d7926a766f2ab9bd6e7aa8cba80b5d3ff26c52b)
51+
52+
### Hotfix
53+
54+
- Removed Cocoapods badges from README
55+
56+
357
## [0.6.0](https://github.com/iabudiab/ObjectiveRocks/releases/tag/0.6.0)
458

559
Released on 2016.06.12
@@ -12,7 +66,7 @@ Released on 2016.06.12
1266
- Support for `Write Batch with Index` and `Write Batch Iterator`
1367
- Support for `Range Compaction` operations
1468
- Nullability annotations
15-
- Better compatibility with Swift
69+
- Better compatibility with Swift
1670
- New statistics and counters
1771
- Cocoapods Podspec
1872
- Travis integration
@@ -21,13 +75,13 @@ Released on 2016.06.12
2175

2276
- RocksDB initializers were changed to class instead of instance methods
2377
- Removed RocksDB methods without error parameter
24-
- Better compatibility with Swift's error-handling model
78+
- Better compatibility with Swift's error-handling model
2579
- Refactored all RocksDB methods so that the error parameter is the last
26-
- Better compatibility with Swift's error-handling model
80+
- Better compatibility with Swift's error-handling model
2781
- Removed `Column Family Metadata` from iOS target
2882
- `RocksDBIteratorKeyRange` is refactored to `RocksDBKeyRange`
29-
- Key ranges are used not only for iterations but also for compaction jobs
30-
- Empty-range constant is refactored to open-range, since it represents a range containing all the keys
83+
- Key ranges are used not only for iterations but also for compaction jobs
84+
- Empty-range constant is refactored to open-range, since it represents a range containing all the keys
3185
- ObjectiveRocks builds frameworks now instead of static libraries
3286

3387
## [0.5.0](https://github.com/iabudiab/ObjectiveRocks/releases/tag/0.5.0)
@@ -43,7 +97,7 @@ Released on 2016.07.30
4397
### Removed
4498

4599
- Removed `+ (instancetype)LRUCacheWithCapacity:numShardsBits:removeScanCountLimit:` RocksDB Cache initializer
46-
- No longer available since: [facebook/rocksdb@c88ff4c](https://github.com/facebook/rocksdb/commit/c88ff4ca76a6a24632cbdd834f621952a251d7a1)
100+
- No longer available since: [facebook/rocksdb@c88ff4c](https://github.com/facebook/rocksdb/commit/c88ff4ca76a6a24632cbdd834f621952a251d7a1)
47101

48102
## [0.4.0](https://github.com/iabudiab/ObjectiveRocks/releases/tag/0.4.0)
49103

@@ -70,7 +124,7 @@ All headers are refactored in this release to provide a pure Objective-C interfa
70124
### Changed
71125

72126
- Updated `Thread Status` API
73-
- Adapted according to the changes introduces in: [facebook/rocksdb@bf287b7](https://github.com/facebook/rocksdb/commit/bf287b76e0e7b5998de49e3ceaa2b34d1f3c13ae)
127+
- Adapted according to the changes introduces in: [facebook/rocksdb@bf287b7](https://github.com/facebook/rocksdb/commit/bf287b76e0e7b5998de49e3ceaa2b34d1f3c13ae)
74128

75129
## [0.3.0](https://github.com/iabudiab/ObjectiveRocks/releases/tag/0.3.0)
76130

Code/ObjectiveRocks.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ extern const unsigned char ObjectiveRocksVersionString[];
2727
#import "RocksDBComparator.h"
2828

2929
#import "RocksDBOptions.h"
30-
#import "RocksDBEncodingOptions.h"
3130
#import "RocksDBDatabaseOptions.h"
3231
#import "RocksDBColumnFamilyOptions.h"
3332
#import "RocksDBWriteOptions.h"
@@ -43,8 +42,6 @@ extern const unsigned char ObjectiveRocksVersionString[];
4342

4443
#import "RocksDBMergeOperator.h"
4544

46-
#import "RocksDBTypes.h"
47-
4845
#if !(defined(ROCKSDB_LITE) && defined(TARGET_OS_IPHONE))
4946

5047
#import "RocksDBColumnFamilyMetadata.h"

0 commit comments

Comments
 (0)