[TIMOB-23588] Android: Recompile appcelerator.encrypteddatabase module against latest SDK

.gitignore

@@ -26,4 +26,8 @@ libs/
 /iphone/LICENSE
 /iphone/openssl-xcode/openssl/libcrypto.a
 /iphone/openssl-xcode/openssl/apps/openssl
-iphone/openssl-xcode/openssl/test
+iphone/openssl-xcode/openssl/test
+/android/assets
+/android/documentation
+/android/example
+/android/LICENSE

.travis.yml

@@ -1,16 +1,24 @@
 language: objective-c
+osx_image: xcode7.3
 env:
  global:
    - "MODULE_NAME=appcelerator.encrypteddatabase"
+   - TRAVIS_NODE_VERSION="4"
 before_install:
     - MODULE_ROOT=$PWD
+    - brew update
+    - brew install nvm
+    - source $(brew --prefix nvm)/nvm.sh
+    - nvm install 4
+    - npm config delete prefix
+    - nvm use --delete-prefix v4.4.7 4
 install:
     - cd $MODULE_ROOT
-    - curl -o install.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/install.sh
-    - source install.sh
-script: 
-    - curl -o script.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/script.sh
+    - curl -o install.sh https://raw.githubusercontent.com/sgtcoolguy/ci/v8/travis/install.sh
+    - source install.sh -s "--branch master"
+script:
+    - curl -o script.sh https://raw.githubusercontent.com/sgtcoolguy/ci/v8/travis/script.sh
     - source script.sh
 after_success: # and this only on success
-  - curl -o deploy.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/deploy.sh
-  - source deploy.sh
+    - curl -o deploy.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/deploy.sh
+    - source deploy.sh

android/build.xml

@@ -16,7 +16,6 @@
 
     <copy todir="libs">
         <fileset dir="lib">
-            <include name="armeabi/*"/>
             <include name="armeabi-v7a/*"/>
             <include name="x86/*"/>
             <exclude name="**/*.java"/>
@@ -35,4 +34,4 @@
 		<symlink action="delete" link="${basedir}/assets"/>
 		<symlink action="delete" link="${basedir}/LICENSE"/>
     </target>
-</project>
+</project>

android/manifest

@@ -2,18 +2,18 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 1.3.2
-apiversion: 2
-architectures: armeabi armeabi-v7a x86
+version: 2.0.0
+apiversion: 3
+architectures: armeabi-v7a x86
 description: Provides transparent, secure 256-bit AES encryption of SQLite database files.
 author: Dawson Toth
 license: Appcelerator Commercial License
-copyright: Copyright (c) 2013 by Appcelerator, Inc.
+copyright: Copyright (c) 2013-2016 by Appcelerator, Inc.
 
 
 # these should not be edited
 name: encrypteddatabase
 moduleid: appcelerator.encrypteddatabase
 guid: d1b3740c-ec53-45c6-8454-8748f91da6ad
 platform: android
-minsdk: 4.0.0.GA
+minsdk: 6.0.0

android/src/appcelerator/encrypteddatabase/TiDatabaseProxy.java

@@ -1,6 +1,6 @@
 /**
  * Appcelerator Titanium Mobile Modules
- * Copyright (c) 2010-2013 by Appcelerator, Inc. All Rights Reserved.
+ * Copyright (c) 2010-2016 by Appcelerator, Inc. All Rights Reserved.
  * Proprietary and Confidential - This source code is not for redistribution
  */
 package appcelerator.encrypteddatabase;
@@ -9,7 +9,6 @@
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.kroll.common.Log;
 import org.appcelerator.titanium.TiApplication;
-import org.appcelerator.titanium.TiContext;
 import org.appcelerator.titanium.TiFileProxy;
 import org.appcelerator.titanium.io.TiFileFactory;
 import org.appcelerator.titanium.util.TiConvert;
@@ -37,10 +36,6 @@ public TiDatabaseProxy(String name, SQLiteDatabase db) {
 		readOnly = false;
 	}
 
-	public TiDatabaseProxy(TiContext tiContext, String name, SQLiteDatabase db) {
-		this(name, db);
-	}
-
 	// readonly database
 	public TiDatabaseProxy(SQLiteDatabase db) {
 		// super(tiContext);
@@ -51,10 +46,6 @@ public TiDatabaseProxy(SQLiteDatabase db) {
 		readOnly = true;
 	}
 
-	public TiDatabaseProxy(TiContext tiContext, SQLiteDatabase db) {
-		this(db);
-	}
-
 	@Kroll.method
 	public void close() {
 		if (db.isOpen()) {

android/src/appcelerator/encrypteddatabase/TiResultSetProxy.java

@@ -1,6 +1,6 @@
 /**
  * Appcelerator Titanium Mobile Modules
- * Copyright (c) 2010-2013 by Appcelerator, Inc. All Rights Reserved.
+ * Copyright (c) 2010-2016 by Appcelerator, Inc. All Rights Reserved.
  * Proprietary and Confidential - This source code is not for redistribution
  */
 package appcelerator.encrypteddatabase;
@@ -10,7 +10,6 @@
 import org.appcelerator.kroll.KrollProxy;
 import org.appcelerator.kroll.annotations.Kroll;
 import org.appcelerator.kroll.common.Log;
-import org.appcelerator.titanium.TiContext;
 import org.appcelerator.titanium.util.TiConvert;
 
 import android.database.Cursor;
@@ -39,10 +38,6 @@ public TiResultSetProxy(Cursor rs) {
 		}
 	}
 
-	public TiResultSetProxy(TiContext tiContext, Cursor rs) {
-		this(rs);
-	}
-
 	@Kroll.method
 	public void close() {
 		if (rs != null && !rs.isClosed()) {