Merge branch 'dev'

couchbase · Mar 2, 2016 · b2eee39 · b2eee39
2 parents 2ebec67 + 76e5abc
commit b2eee39
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/CouchbaseLite.xcodeproj/project.pbxproj b/CouchbaseLite.xcodeproj/project.pbxproj
@@ -5377,6 +5377,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CURRENT_PROJECT_VERSION = 0;
+				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -5440,6 +5441,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CURRENT_PROJECT_VERSION = 0;
+				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -5461,6 +5463,8 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				OTHER_CFLAGS = "-fembed-bitcode";
+				OTHER_CPLUSPLUSFLAGS = "-fembed-bitcode";
 				SDKROOT = macosx;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				UNIVERSAL_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)-$(UNIVERSAL_NAME_$(PLATFORM_NAME))-universal";

diff --git a/Source/API/Extras/CBLEncryptionController.m b/Source/API/Extras/CBLEncryptionController.m
@@ -101,7 +101,7 @@ - (void) completedWithKey: (id)keyOrPassword orError: (NSError*)error {
         Log(@"EncryptionController: Got database password/key! Opening db...");
         [_manager registerEncryptionKey: keyOrPassword forDatabaseNamed: _dbName];
         db = [_manager databaseNamed: _dbName error: &error];
-        Log(@"    db=%@,  error=%@", db, error.my_compactDescription);
+        Log(@"    db=%@,  error=%@", db, error);
         if (!db && error.code == 401 && !_useTouchID) {
             // Wrong password; let the user retry after a brief delay:
             [_manager registerEncryptionKey: nil forDatabaseNamed: _dbName];
@@ -114,7 +114,7 @@ - (void) completedWithKey: (id)keyOrPassword orError: (NSError*)error {
         }
     }
     if (error) {
-        Log(@"EncryptionController: Failed with error: %@", error.my_compactDescription);
+        Log(@"EncryptionController: Failed with error: %@", error);
     }
     _completion(db, error);
     _completion = nil;

diff --git a/Test-iOS/RootViewController.m b/Test-iOS/RootViewController.m
@@ -23,6 +23,7 @@
 #import "DemoAppDelegate.h"
 
 #import "CouchbaseLite.h"
+#import "MYLogging.h"
 #import "CBLView+Internal.h"
 #import "CBLDatabase+Insertion.h"
 #import "CBLJSON.h"

diff --git a/vendor/BLIP b/vendor/BLIP
diff --git a/vendor/CBForest b/vendor/CBForest
+3 −0		BLIP.xcodeproj/project.pbxproj
+1 −1		vendor/PocketSocket
+8 −0		C/c4Document.cc
+2 −1		CBForest.VS2015/CBForest.VS2015.vcxproj
+3 −0		CBForest.VS2015/CBForest.VS2015.vcxproj.filters
+12 −19		CBForest.xcodeproj/project.pbxproj
+2 −4		CBForest/Collatable.cc
+1 −1		CBForest/Collatable.hh
+1 −1		CBForest/Collatable.mm
+19 −3		CBForest/DocEnumerator.cc
+1 −4		CBForest/Document.cc
+3 −7		CBForest/Error.hh
+1 −0		CBForest/FullTextIndex.cc
+1 −0		CBForest/Index.cc
+4 −4		CBForest/SecureRandomize.hh
+2 −2		CBForest/slice.cc
+16 −2		CBForest/slice.hh
+1 −3		CBForest/slice.mm
+13 −11		CSharp/NativeBuild/Makefile
+3 −1		CSharp/NativeBuild/build-interop-ios-fat.sh
+18 −0		CSharp/NativeBuild/build-interop-osx.sh
+10 −0		CSharp/NativeBuild/gen_linux_symbol_list.sh
+2 −1		CSharp/NativeBuild/jni/Android.mk
+1 −1		CSharp/NativeBuild/jni/Application.mk
+6 −0		CSharp/NativeBuild/stripopts
+3 −3		CSharp/README.md
+47 −2		CSharp/Tests/cbforest-sharp-tests.Shared/C4DatabaseTest.cs
+148 −0		CSharp/Tests/cbforest-sharp-tests.Shared/C4GeoTest.cs
+109 −0		CSharp/Tests/cbforest-sharp-tests.Shared/C4ViewTest.cs
+1 −0		CSharp/Tests/cbforest-sharp-tests.Shared/cbforest-sharp-tests.Shared.projitems
+26 −2		CSharp/cbforest-sharp.Droid/cbforest-sharp.Droid.csproj
+47 −6		CSharp/cbforest-sharp.Net35/cbforest-sharp.Net35.csproj
+34 −6		CSharp/cbforest-sharp.Net45/cbforest-sharp.Net45.csproj
+28 −0		CSharp/cbforest-sharp.Shared/Defines.cs
+505 −12		CSharp/cbforest-sharp.Shared/Native.cs
+2 −1		CSharp/cbforest-sharp.Shared/Properties/AssemblyInfo.cs
+193 −11		CSharp/cbforest-sharp.Shared/Types.cs
+4 −0		CSharp/cbforest-sharp.Shared/Utils/CBForestHistoryEnumerator.cs
+49 −8		CSharp/cbforest-sharp.Shared/Utils/CBForestQueryEnumerator.cs
+0 −5		CSharp/cbforest-sharp.iOS/cbforest-sharp.dll.config
+2 −5		CSharp/cbforest-sharp.iOS/cbforest-sharp.iOS.csproj
+1 −1		CSharp/prebuilt/README.txt
+9 −8		Java/jni/native_document.cc
+23 −9		Java/jni/native_glue.cc
+12 −3		Java/jni/native_glue.hh