From 21f781942223d8eb6f5b313f605a83796dba187a Mon Sep 17 00:00:00 2001 From: Ryan Boyajian Date: Tue, 14 Apr 2015 15:55:02 -0600 Subject: [PATCH 1/2] Update CocoaLumberjack to use version 2. --- YapDatabase.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/YapDatabase.podspec b/YapDatabase.podspec index d953f8add..0d1eb3775 100644 --- a/YapDatabase.podspec +++ b/YapDatabase.podspec @@ -14,7 +14,7 @@ Pod::Spec.new do |s| # use a builtin version of sqlite3 s.subspec 'standard' do |ss| ss.library = 'sqlite3' - ss.dependency 'CocoaLumberjack', '~> 1' + ss.dependency 'CocoaLumberjack', '~> 2' ss.source_files = 'YapDatabase/**/*.{h,m,mm}' ss.private_header_files = 'YapDatabase/**/Internal/*.h' ss.xcconfig = { 'OTHER_LDFLAGS' => '-weak_library /usr/lib/libc++.dylib' } @@ -24,7 +24,7 @@ Pod::Spec.new do |s| # use SQLCipher and enable -DSQLITE_HAS_CODEC flag s.subspec 'SQLCipher' do |ss| ss.dependency 'SQLCipher/fts' - ss.dependency 'CocoaLumberjack', '~> 1' + ss.dependency 'CocoaLumberjack', '~> 2' ss.source_files = 'YapDatabase/**/*.{h,m,mm}' ss.private_header_files = 'YapDatabase/**/Internal/*.h' ss.xcconfig = { 'OTHER_LDFLAGS' => '-weak_library /usr/lib/libc++.dylib', 'OTHER_CFLAGS' => '$(inherited) -DSQLITE_HAS_CODEC' } From 0c0345d69ded9b1ce41040f911fb5d95ece4faf7 Mon Sep 17 00:00:00 2001 From: Sean Dougherty Date: Tue, 15 Sep 2015 12:25:38 -0600 Subject: [PATCH 2/2] Remove -weak_library references in podspec bitcode and web_library references cannot exist at the same time in Xcode 7 compiles --- YapDatabase.podspec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/YapDatabase.podspec b/YapDatabase.podspec index 0d1eb3775..1bd41e935 100644 --- a/YapDatabase.podspec +++ b/YapDatabase.podspec @@ -17,7 +17,6 @@ Pod::Spec.new do |s| ss.dependency 'CocoaLumberjack', '~> 2' ss.source_files = 'YapDatabase/**/*.{h,m,mm}' ss.private_header_files = 'YapDatabase/**/Internal/*.h' - ss.xcconfig = { 'OTHER_LDFLAGS' => '-weak_library /usr/lib/libc++.dylib' } ss.requires_arc = true end @@ -27,7 +26,7 @@ Pod::Spec.new do |s| ss.dependency 'CocoaLumberjack', '~> 2' ss.source_files = 'YapDatabase/**/*.{h,m,mm}' ss.private_header_files = 'YapDatabase/**/Internal/*.h' - ss.xcconfig = { 'OTHER_LDFLAGS' => '-weak_library /usr/lib/libc++.dylib', 'OTHER_CFLAGS' => '$(inherited) -DSQLITE_HAS_CODEC' } + ss.xcconfig = { 'OTHER_CFLAGS' => '$(inherited) -DSQLITE_HAS_CODEC' } ss.requires_arc = true end