Updated for use with LiquidCore 0.7.2+

Author: ericwlange

include.gradle

@@ -0,0 +1,43 @@
+apply plugin: 'de.undercouch.download'
+import groovy.json.JsonSlurper
+
+def getNodeSQLite3VersionFromNpm() {
+    def inputFile = new File(buildscript.getSourceFile().getParent(), "package.json")
+    def packageJson = new JsonSlurper().parseText(inputFile.text)
+
+    return packageJson["version"]
+}
+
+if (!project.hasProperty('node_sqlite3_include_gradle')) {
+  project.ext.set('node_sqlite3_include_gradle', true)
+  def _sqlite3_aar = "sqlite3-lib-" + getNodeSQLite3VersionFromNpm() + ".aar"
+
+  def downloadsDir_node_sqlite3 = new File(rootProject.projectDir, ".liquidcore")
+  task createDownloadsDir_node_sqlite3 {
+      downloadsDir_node_sqlite3.mkdirs()
+  }
+  dependencies {
+      if (findProject(':sqlite3-lib') != null) {
+          implementation project(':sqlite3-lib')
+      } else {
+          implementation fileTree(include:[_sqlite3_aar], dir:downloadsDir_node_sqlite3)
+      }
+  }
+
+  if (findProject(':sqlite3-lib') == null) {
+    android { tasks.withType(JavaCompile) {
+        compileTask -> compileTask.dependsOn download_sqlite3_lib }}
+    task download_sqlite3_lib(dependsOn: createDownloadsDir_node_sqlite3, type: Download) {
+        src 'https://liquidplayer.github.io/packages/' + _sqlite3_aar
+        onlyIfNewer true
+        overwrite false
+        dest new File(downloadsDir_node_sqlite3, _sqlite3_aar)
+    }
+  }
+
+  try {
+    apply from: new File(rootProject.projectDir, 'node_modules/liquidcore/include.gradle')
+  } catch (Exception e) {
+    apply from: new File(buildscript.getSourceFile(), '../node_modules/liquidcore/include.gradle')
+  }
+}

lib/sqlite3.js

@@ -2,12 +2,11 @@ var binary = require('node-pre-gyp');
 var path = require('path');
 var binding;
 try {
-    function stealth_require() { return require.call(null, ...arguments); }
+    function stealth_require() { return LiquidCore.require.call(null, ...arguments); }
     var binding_path = binary.find(path.resolve(path.join(__dirname,'../package.json')));
-    console.log(binding_path)
     binding = stealth_require(binding_path);
 } catch(e) {
-    binding = global.node_require('node_sqlite3.node');
+    binding = LiquidCore.require('node_sqlite3.node');
 }
 var sqlite3 = module.exports = exports = binding;
 var EventEmitter = require('events').EventEmitter;

liquidcore/.gitignore

@@ -13,3 +13,4 @@
 .externalNativeBuild
 Pods/
 xcuserdata/
+.liquidcore/

liquidcore/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Jan 22 12:17:55 CET 2019
+#Sun Jan 26 10:03:52 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

liquidcore/node-sqlite3/.gitignore

@@ -1 +1,2 @@
 /build
+/.cxx

liquidcore/node-sqlite3/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'de.undercouch.download'
 
 android {
     compileSdkVersion 28
@@ -29,53 +30,14 @@ android {
     }
 }
 
-configurations {
-    liquidcore {}
-}
-
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.1.0'
     testImplementation 'junit:junit:4.12'
     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.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'
-    }
-}
-
-task extractAddOnLibsAndHeaders(type: Sync) {
-    dependsOn configurations.liquidcore
-
-    from {
-        configurations.liquidcore.collect {zipTree(it)}
-    }
-    include "jni/**/*.so", "include/**/*"
-    into "build/liquidcore-addon"
 }
 
-afterEvaluate {
-    def addon = file('build/liquidcore-addon')
-    if (!addon.exists()) {
-        if (project.hasProperty("externalNativeBuildDebug")) {
-            externalNativeBuildDebug.dependsOn extractAddOnLibsAndHeaders
-        }
-        if (project.hasProperty("externalNativeBuildRelease")) {
-            externalNativeBuildRelease.dependsOn extractAddOnLibsAndHeaders
-        }
-    }
-}
-
-apply plugin: 'com.github.dcendents.android-maven'
-
-group='com.github.liquidplayer'
+apply from: new File(buildscript.getSourceFile(), '../../../node_modules/liquidcore/include.gradle')
+apply from: new File(buildscript.getSourceFile(), '../../../node_modules/liquidcore/addon.gradle')

liquidcore/node-sqlite3/src/androidTest/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.liquidplayer.node">
+    package="org.liquidplayer.node_sqlite3">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

liquidcore/node-sqlite3/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="org.liquidplayer.node_sqlite3">
-
 </manifest>

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

@@ -1,60 +1,49 @@
 cmake_minimum_required(VERSION 3.4.1)
 
 add_library(
-        node-sqlite3.node
-        SHARED
-        sqlite3_shim.cpp
-        ${PROJECT_SOURCE_DIR}/../../../../../src/node_sqlite3.cc
-        ${PROJECT_SOURCE_DIR}/../../../../../src/database.cc
-        ${PROJECT_SOURCE_DIR}/../../../../../src/statement.cc
+  node-sqlite3.node
+  SHARED
+  sqlite3_shim.cpp
+  ${PROJECT_SOURCE_DIR}/../../../../../src/node_sqlite3.cc
+  ${PROJECT_SOURCE_DIR}/../../../../../src/database.cc
+  ${PROJECT_SOURCE_DIR}/../../../../../src/statement.cc
 )
 
 include_directories(
-        ${PROJECT_SOURCE_DIR}/../../../build/liquidcore-addon/include/node
-        ${PROJECT_SOURCE_DIR}/../../../build/liquidcore-addon/include/v8
-        ${PROJECT_SOURCE_DIR}/../../../build/liquidcore-addon/include/uv
-        ${PROJECT_SOURCE_DIR}/../../../build/liquidcore-addon/include/cares
-        ${PROJECT_SOURCE_DIR}/../../../build/liquidcore-addon/include
-        ${PROJECT_SOURCE_DIR}/../../../../../src
-        ${PROJECT_SOURCE_DIR}
-        ${PROJECT_SOURCE_DIR}/../../../../../node_modules/nan
+  ${PROJECT_SOURCE_DIR}/../../../build/liquidcore-addon/include/node
+  ${PROJECT_SOURCE_DIR}/../../../build/liquidcore-addon/include/v8
+  ${PROJECT_SOURCE_DIR}/../../../build/liquidcore-addon/include/uv
+  ${PROJECT_SOURCE_DIR}/../../../build/liquidcore-addon/include/cares
+  ${PROJECT_SOURCE_DIR}/../../../build/liquidcore-addon/include
+  ${PROJECT_SOURCE_DIR}/../../../../../src
+  ${PROJECT_SOURCE_DIR}
+  ${PROJECT_SOURCE_DIR}/../../../../../node_modules/nan
 )
 
 unset(EXTRA_CXX_FLAGS)
 list(APPEND EXTRA_CXX_FLAGS
-        -Wno-deprecated-declarations
-        -DNODE_WANT_INTERNALS=1
+  -Wno-deprecated-declarations
+  -DNODE_WANT_INTERNALS=1
 )
 string (REPLACE ";" " " CPP_FLAGS_STR "${EXTRA_CXX_FLAGS}")
 SET( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${CPP_FLAGS_STR}" )
 
-
-find_library(
-        log-lib
-        log)
-
-add_library(
-        js-lib
-        SHARED
-        IMPORTED
-)
-add_library(
-        liquidcore-lib
-        SHARED
-        IMPORTED
-)
+find_library(log-lib log)
+add_library(js-lib SHARED IMPORTED)
+add_library(liquidcore-lib SHARED IMPORTED)
 set_target_properties(
-        js-lib
-        PROPERTIES IMPORTED_LOCATION
-        ${PROJECT_SOURCE_DIR}/../../../build/liquidcore-addon/jni/${ANDROID_ABI}/libliquidjs.so
+  js-lib
+  PROPERTIES IMPORTED_LOCATION
+  ${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}/libliquidnode.so
+  liquidcore-lib
+  PROPERTIES IMPORTED_LOCATION
+  ${PROJECT_SOURCE_DIR}/../../../build/liquidcore-addon/jni/${ANDROID_ABI}/libliquidnode.so
 )
 target_link_libraries( # Specifies the target library.
-        node-sqlite3.node
-        js-lib
-        liquidcore-lib
-        ${log-lib})
+  node-sqlite3.node
+  js-lib
+  liquidcore-lib
+  ${log-lib}
+)

liquidcore/release/node-sqlite3-release.aar

@@ -1,5 +1,10 @@
 include ':node-sqlite3'
-include ':LiquidCore'
+/*
+include ':liquidcore-Nodejs'
+include ':liquidcore-V8'
 
-project(':LiquidCore').projectDir = new File(
-        rootProject.projectDir, '../../LiquidCore/LiquidCoreAndroid')
+project(':liquidcore-Nodejs').projectDir = new File(
+        rootProject.projectDir, '../LiquidCore/LiquidCore')
+project(':liquidcore-V8').projectDir = new File(
+        rootProject.projectDir, '../LiquidCore/LiquidV8')
+*/