Merge pull request #936 from brussee/update-sqlite3-apsw

Update recipes sqlite3 to 3.15.1 and apsw to 3.15.0-r1 both with FTS4 enabled
kivy · Nov 26, 2016 · 9525ab4 · 9525ab4
2 parents 1025b2d + 7594c10
commit 9525ab4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pythonforandroid/recipes/apsw/__init__.py b/pythonforandroid/recipes/apsw/__init__.py
@@ -3,7 +3,7 @@
 import sh
 
 class ApswRecipe(PythonRecipe):
-    version = '3.11.1-r1'
+    version = '3.15.0-r1'
     url = 'https://github.com/rogerbinns/apsw/archive/{version}.tar.gz'
     depends = ['sqlite3', 'hostpython2', 'python2', 'setuptools']
     call_hostpython_via_targetpython = False
@@ -17,7 +17,7 @@ def build_arch(self, arch):
             shprint(hostpython,
                     'setup.py',
                     'build_ext',
-                    '--enable=fts3'
+                    '--enable=fts4'
             , _env=env)
         # Install python bindings
         super(ApswRecipe, self).build_arch(arch)

diff --git a/pythonforandroid/recipes/sqlite3/Android.mk b/pythonforandroid/recipes/sqlite3/Android.mk
@@ -6,6 +6,6 @@ LOCAL_SRC_FILES := sqlite3.c
 
 LOCAL_MODULE := sqlite3
 
-LOCAL_CFLAGS := -DSQLITE_ENABLE_FTS3
+LOCAL_CFLAGS := -DSQLITE_ENABLE_FTS4
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/pythonforandroid/recipes/sqlite3/__init__.py b/pythonforandroid/recipes/sqlite3/__init__.py
@@ -3,9 +3,9 @@
 import sh
 
 class Sqlite3Recipe(NDKRecipe):
-    version = '3.12.2'
+    version = '3.15.1'
     # Don't forget to change the URL when changing the version
-    url = 'https://www.sqlite.org/2016/sqlite-amalgamation-3120200.zip'
+    url = 'https://www.sqlite.org/2016/sqlite-amalgamation-3150100.zip'
     generated_libraries = ['sqlite3']
 
     def should_build(self, arch):