Merge branch 'layerhq-bugfix/overhaul-dependency-imports'

FMDB.podspec

@@ -1,24 +1,19 @@
 Pod::Spec.new do |s|
   s.name = 'FMDB'
-  s.version = '2.5'
+  s.version = '2.5.1'
   s.summary = 'A Cocoa / Objective-C wrapper around SQLite.'
   s.homepage = 'https://github.com/ccgus/fmdb'
   s.license = 'MIT'
   s.author = { 'August Mueller' => 'gus@flyingmeat.com' }
-  s.source = { :git => 'https://github.com/ccgus/fmdb.git', :tag => 'v2.5' }
+  s.source = { :git => 'https://github.com/ccgus/fmdb.git', :tag => "#{s.version}" }
   s.requires_arc = true
-
-  s.default_subspec = 'standard'
-
-  s.subspec 'common' do |ss|
-    ss.source_files = 'src/fmdb/FM*.{h,m}'
-    ss.exclude_files = 'src/fmdb.m'
-  end
+  s.default_subspec = 'standard'  
 
   # use the built-in library version of sqlite3
   s.subspec 'standard' do |ss|
     ss.library = 'sqlite3'
-    ss.dependency 'FMDB/common'
+    ss.source_files = 'src/fmdb/FM*.{h,m}'
+    ss.exclude_files = 'src/fmdb.m'
   end
 
   # use the built-in library version of sqlite3 with custom FTS tokenizer source files
@@ -27,26 +22,30 @@ Pod::Spec.new do |s|
     ss.dependency 'FMDB/standard'
   end
 
-  # build the latest stable version of sqlite3
+  # use a custom built version of sqlite3
   s.subspec 'standalone' do |ss|
-    ss.default_subspec = 'default'
-    ss.dependency 'FMDB/common'
+    ss.default_subspec = 'default'    
+    ss.xcconfig = { 'OTHER_CFLAGS' => '$(inherited) -DFMDB_SQLITE_STANDALONE -DHAVE_USLEEP=1' }
     
     ss.subspec 'default' do |sss|
       sss.dependency 'sqlite3'
+      sss.source_files = 'src/fmdb/FM*.{h,m}'
+      sss.exclude_files = 'src/fmdb.m'
     end
 
-    # build with FTS support and custom FTS tokenizer source files
+    # add FTS, custom FTS tokenizer source files, and unicode61 tokenizer support
     ss.subspec 'FTS' do |sss|
       sss.source_files = 'src/extra/fts3/*.{h,m}'
-      sss.dependency 'sqlite3/fts'
+      sss.dependency 'sqlite3/unicode61'
+      sss.dependency 'FMDB/standalone/default'
     end
   end
 
   # use SQLCipher and enable -DSQLITE_HAS_CODEC flag
   s.subspec 'SQLCipher' do |ss|
     ss.dependency 'SQLCipher'
-    ss.dependency 'FMDB/common'
+    ss.source_files = 'src/fmdb/FM*.{h,m}'
+    ss.exclude_files = 'src/fmdb.m'
     ss.xcconfig = { 'OTHER_CFLAGS' => '$(inherited) -DSQLITE_HAS_CODEC -DHAVE_USLEEP=1' }
   end
   

src/extra/fts3/FMDatabase+FTS3.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Andrew Goodale. All rights reserved.
 //
 
-#import "FMDatabase.h"
+#import <FMDB/FMDatabase.h>
 
 /**
  Names of commands that can be issued against an FTS table.

src/fmdb/FMDatabase.h

@@ -1,5 +1,9 @@
 #import <Foundation/Foundation.h>
-#import "sqlite3.h"
+#if FMDB_SQLITE_STANDALONE
+#import <sqlite3/sqlite3.h>
+#else
+#import <sqlite3.h>
+#endif
 #import "FMResultSet.h"
 #import "FMDatabasePool.h"
 

src/fmdb/FMDatabasePool.h

@@ -7,7 +7,11 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "sqlite3.h"
+#if FMDB_SQLITE_STANDALONE
+#import <sqlite3/sqlite3.h>
+#else
+#import <sqlite3.h>
+#endif
 
 @class FMDatabase;
 

src/fmdb/FMDatabaseQueue.h

@@ -7,7 +7,11 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "sqlite3.h"
+#if FMDB_SQLITE_STANDALONE
+#import <sqlite3/sqlite3.h>
+#else
+#import <sqlite3.h>
+#endif
 
 @class FMDatabase;
 

src/fmdb/FMResultSet.h

@@ -1,5 +1,9 @@
 #import <Foundation/Foundation.h>
-#import "sqlite3.h"
+#if FMDB_SQLITE_STANDALONE
+#import <sqlite3/sqlite3.h>
+#else
+#import <sqlite3.h>
+#endif
 
 #ifndef __has_feature      // Optional.
 #define __has_feature(x) 0 // Compatibility with non-clang compilers.