Upgraded to androidx and LiquidCore 0.7.0

Author: ericwlange

liquidcore/build.gradle

@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath 'de.undercouch:gradle-download-task:3.4.3'
     }

liquidcore/node-sqlite3/build.gradle

@@ -8,7 +8,7 @@ android {
         versionCode 1
         versionName "0.1.4"
         setProperty("archivesBaseName", "node-sqlite3")
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
                 abiFilters "x86", "armeabi-v7a", "x86_64", "arm64-v8a"
@@ -35,18 +35,22 @@ configurations {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.annotation:annotation:1.1.0'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test:rules:1.2.0'
 
     if (findProject(':LiquidCore') != null) {
         liquidcore project(path: ':LiquidCore', configuration: 'default')
+        liquidcore project(path: ':LiquidV8', configuration: 'default')
         implementation project(':LiquidCore')
+        implementation project(':LiquidV8')
     } else {
-        liquidcore 'com.github.LiquidPlayer:LiquidCore:0.6.0'
-        implementation 'com.github.LiquidPlayer:LiquidCore:0.6.0'
+        liquidcore 'com.github.LiquidPlayer:LiquidCore:0.7.0'
+        liquidcore 'com.github.LiquidPlayer:LiquidV8:0.7.0'
+        implementation 'com.github.LiquidPlayer:LiquidCore:0.7.0'
+        implementation 'com.github.LiquidPlayer:LiquidV8:0.7.0'
     }
 }
 

liquidcore/node-sqlite3/src/androidTest/java/org/liquidplayer/node_sqlite3/SQLite3Test.java

@@ -1,8 +1,8 @@
 package org.liquidplayer.node_sqlite3;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

liquidcore/node-sqlite3/src/main/cpp/CMakeLists.txt

@@ -34,7 +34,7 @@ find_library(
         log)
 
 add_library(
-        node-lib
+        js-lib
         SHARED
         IMPORTED
 )
@@ -44,17 +44,17 @@ add_library(
         IMPORTED
 )
 set_target_properties(
-        node-lib
+        js-lib
         PROPERTIES IMPORTED_LOCATION
-        ${PROJECT_SOURCE_DIR}/../../../build/liquidcore-addon/jni/${ANDROID_ABI}/libnode.so
+        ${PROJECT_SOURCE_DIR}/../../../build/liquidcore-addon/jni/${ANDROID_ABI}/libliquidjs.so
 )
 set_target_properties(
         liquidcore-lib
         PROPERTIES IMPORTED_LOCATION
-        ${PROJECT_SOURCE_DIR}/../../../build/liquidcore-addon/jni/${ANDROID_ABI}/libliquidcore.so
+        ${PROJECT_SOURCE_DIR}/../../../build/liquidcore-addon/jni/${ANDROID_ABI}/libliquidnode.so
 )
 target_link_libraries( # Specifies the target library.
         node-sqlite3.node
-        node-lib
+        js-lib
         liquidcore-lib
         ${log-lib})

liquidcore/node-sqlite3/src/main/java/org/liquidplayer/node_sqlite3/SQLite3Shim.java

@@ -23,7 +23,7 @@
 import android.database.sqlite.SQLiteOutOfMemoryException;
 import android.database.sqlite.SQLiteReadOnlyDatabaseException;
 import android.database.sqlite.SQLiteTableLockedException;
-import android.support.annotation.Keep;
+import androidx.annotation.Keep;
 
 import static org.liquidplayer.node_sqlite3.SQLite3Shim.CODES.SQLITE_ERROR;
 import static org.liquidplayer.node_sqlite3.SQLite3Shim.CODES.SQLITE_OK;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@liquidcore/sqlite3",
   "description": "Asynchronous, non-blocking SQLite3 bindings",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "homepage": "http://github.com/mapbox/node-sqlite3",
   "author": {
     "name": "MapBox",