Merge branch 'release/0.7.0'

iabudiab · Feb 19, 2017 · a2b6a4d · a2b6a4d
2 parents 6e02f05 + f26a870
commit a2b6a4d
Show file tree

Hide file tree

Showing 105 changed files with 2,584 additions and 3,137 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,35 @@
 language: objective-c
-osx_image: xcode7.3
+osx_image: xcode8.2
+
+branches:
+  except:
+    - gh-pages
+
+install:
+  - gem install xcpretty
+
+env:
+  global:
+    - LC_CTYPE=en_US.UTF-8
+    - LANG=en_US.UTF-8
+    - WORKSPACE=ObjectiveRocks.xcworkspace
+    - IOS_FRAMEWORK_SCHEME=ObjectiveRocks-iOS
+    - MACOS_FRAMEWORK_SCHEME=ObjectiveRocks
+    - IOS_SDK=iphonesimulator10.2
+    - MACOS_SDK=macosx10.12
+  matrix:
+    - DESTINATION="arch=x86_64"                              SIMULATOR=""                                   SCHEME="$MACOS_FRAMEWORK_SCHEME"    SDK="$MACOS_SDK"
+    - DESTINATION="OS=9.0,name=iPhone 6"                     SIMULATOR="iPhone 6 (9.0)"                     SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
+    - DESTINATION="OS=9.1,name=iPhone 6 Plus"                SIMULATOR="iPhone 6 Plus (9.1)"                SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
+    - DESTINATION="OS=9.2,name=iPhone 6S"                    SIMULATOR="iPhone 6S (9.2)"                    SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
+    - DESTINATION="OS=9.3,name=iPhone 6S Plus"               SIMULATOR="iPhone 6S Plus (9.3)"               SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
+    - DESTINATION="OS=10.1,name=iPhone 7 Plus"               SIMULATOR="iPhone 7 Plus (10.1)"               SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
+
 script:
-- xcodebuild -project ObjectiveRocks.xcodeproj -scheme ObjectiveRocks -sdk macosx ONLY_ACTIVE_ARCH=NO
-- xcodebuild test -project ObjectiveRocks.xcodeproj -scheme ObjectiveRocksTests -sdk macosx ONLY_ACTIVE_ARCH=NO
-- xcodebuild -project ObjectiveRocks.xcodeproj -scheme ObjectiveRocks-iOS -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO
-- xcodebuild test -project ObjectiveRocks.xcodeproj -scheme ObjectiveRocksTests-iOS -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO
+  - set -o pipefail
+  - xcodebuild -version
+  - xcodebuild -showsdks
+  - SIMULATOR_ID=$(xcrun instruments -s devices | grep -io "$SIMULATOR \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
+  - open -b com.apple.iphonesimulator --args -CurrentDeviceUDID $SIMULATOR_ID
+  - travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean build | xcpretty -c
+  - travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,59 @@
 # Change Log
 
+## [0.7.0](https://github.com/iabudiab/ObjectiveRocks/releases/tag/0.7.0)
+
+Released on 2017.02.19
+
+- RocksDB Version: `4.6.1`: [facebook/rocksdb@8d7926a](https://github.com/facebook/rocksdb/commit/8d7926a766f2ab9bd6e7aa8cba80b5d3ff26c52b)
+
+### Added
+
+- Missing nullability annotations and light-weight generics throughout code base
+- New playground content
+
+### Updated
+
+- Project for Xcode 8
+- Swift tests for Swift 3
+- Playground contents and syntax for Swift 3
+- Travis config for iOS 10.2, macOS 10.12
+- Deployment targets to macOS 10.10, iOS 9.0
+
+### Removed
+
+- Removed the deprecated `timeoutHint` option
+- Removed the deprecated `maxMemCompactionLevel` option
+
+### Breaking Changes
+
+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.
+
+- Removed built-it Key/Value `Encoders` and `Decoders`
+	- The conversions of custom types to/from `NSData` is the responsibility of the caller
+- Removed `EncodingOptions`
+- Removed all methods depending on `EncodingOptions` and the built-in key/value `encoding` and all of the their variants:
+	- `setObject:forKey:`
+	- `deleteObjectForKey:`
+	- `objectForKey:`
+	- `mergeObject:forKey:`
+	- `mergeOperation:forKey:`
+- Refactored all `Iterator`, `Key Comparator` and `Merge Operator` methods accordingly
+- Removed `NSNumber` Key-Comparators
+- Rename method for setting up default read & write options from `setDefaultReadOptions:andWriteOptions:` to `setDefaultReadOptions:writeOptions:`
+	- The custom Swift equivalent is `setDefault(readOptions:writeOptions:)`
+
+
+## [0.6.0](https://github.com/iabudiab/ObjectiveRocks/releases/tag/0.6.0)
+
+Released on 2016.06.12
+
+- RocksDB Version: `4.6.1`: [facebook/rocksdb@8d7926a](https://github.com/facebook/rocksdb/commit/8d7926a766f2ab9bd6e7aa8cba80b5d3ff26c52b)
+
+### Hotfix
+
+- Removed Cocoapods badges from README
+
+
 ## [0.6.0](https://github.com/iabudiab/ObjectiveRocks/releases/tag/0.6.0)
 
 Released on 2016.06.12
@@ -12,7 +66,7 @@ Released on 2016.06.12
 - Support for `Write Batch with Index` and `Write Batch Iterator`
 - Support for `Range Compaction` operations
 - Nullability annotations
-	- Better compatibility with Swift
+  - Better compatibility with Swift
 - New statistics and counters
 - Cocoapods Podspec
 - Travis integration
@@ -21,13 +75,13 @@ Released on 2016.06.12
 
 - RocksDB initializers were changed to class instead of instance methods
 - Removed RocksDB methods without error parameter
-	- Better compatibility with Swift's error-handling model
+  - Better compatibility with Swift's error-handling model
 - Refactored all RocksDB methods so that the error parameter is the last
-	- Better compatibility with Swift's error-handling model
+  - Better compatibility with Swift's error-handling model
 - Removed `Column Family Metadata` from iOS target
 - `RocksDBIteratorKeyRange` is refactored to `RocksDBKeyRange`
-	- Key ranges are used not only for iterations but also for compaction jobs
-	- Empty-range constant is refactored to open-range, since it represents a range containing all the keys
+  - Key ranges are used not only for iterations but also for compaction jobs
+  - Empty-range constant is refactored to open-range, since it represents a range containing all the keys
 - ObjectiveRocks builds frameworks now instead of static libraries
 
 ## [0.5.0](https://github.com/iabudiab/ObjectiveRocks/releases/tag/0.5.0)
@@ -43,7 +97,7 @@ Released on 2016.07.30
 ### Removed
 
 - Removed `+ (instancetype)LRUCacheWithCapacity:numShardsBits:removeScanCountLimit:` RocksDB Cache initializer
-	- No longer available since: [facebook/rocksdb@c88ff4c](https://github.com/facebook/rocksdb/commit/c88ff4ca76a6a24632cbdd834f621952a251d7a1)
+  - No longer available since: [facebook/rocksdb@c88ff4c](https://github.com/facebook/rocksdb/commit/c88ff4ca76a6a24632cbdd834f621952a251d7a1)
 
 ## [0.4.0](https://github.com/iabudiab/ObjectiveRocks/releases/tag/0.4.0)
 
@@ -70,7 +124,7 @@ All headers are refactored in this release to provide a pure Objective-C interfa
 ### Changed
 
 - Updated `Thread Status` API
-	- Adapted according to the changes introduces in: [facebook/rocksdb@bf287b7](https://github.com/facebook/rocksdb/commit/bf287b76e0e7b5998de49e3ceaa2b34d1f3c13ae)
+  - Adapted according to the changes introduces in: [facebook/rocksdb@bf287b7](https://github.com/facebook/rocksdb/commit/bf287b76e0e7b5998de49e3ceaa2b34d1f3c13ae)
 
 ## [0.3.0](https://github.com/iabudiab/ObjectiveRocks/releases/tag/0.3.0)
 

diff --git a/Code/ObjectiveRocks.h b/Code/ObjectiveRocks.h
@@ -27,7 +27,6 @@ extern const unsigned char ObjectiveRocksVersionString[];
 #import "RocksDBComparator.h"
 
 #import "RocksDBOptions.h"
-#import "RocksDBEncodingOptions.h"
 #import "RocksDBDatabaseOptions.h"
 #import "RocksDBColumnFamilyOptions.h"
 #import "RocksDBWriteOptions.h"
@@ -43,8 +42,6 @@ extern const unsigned char ObjectiveRocksVersionString[];
 
 #import "RocksDBMergeOperator.h"
 
-#import "RocksDBTypes.h"
-
 #if !(defined(ROCKSDB_LITE) && defined(TARGET_OS_IPHONE))
 
 #import "RocksDBColumnFamilyMetadata.h"