Switch to use SQLite_jll for binary dependency (#201)

* Switch to use SQLite_jll for binary dependency

* Fixes

* Fix

Author: quinnj

Project.toml

@@ -10,13 +10,15 @@ DBInterface = "a10d1c49-ce27-4219-8d33-6db1a4562965"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+SQLite_jll = "76ed43ae-9a5d-5a62-8c75-30186b810ce8"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 WeakRefStrings = "ea10d353-3f73-51f8-a26c-33c1cb351aa5"
 
 [compat]
 BinaryProvider = "0.5"
 DBInterface = "2"
+SQLite_jll = "3"
 Tables = "1"
 WeakRefStrings = "0.4,0.5,0.6"
 julia = "1"

deps/build.jl

@@ -1,30 +1,32 @@
+@static if VERSION < v"1.3.0"
+
 using BinaryProvider # requires BinaryProvider 0.3.0 or later
 
 # Parse some basic command-line arguments
 const verbose = "--verbose" in ARGS
 const prefix = Prefix(get([a for a in ARGS if a != "--verbose"], 1, joinpath(@__DIR__, "usr")))
 products = [
-    LibraryProduct(prefix, ["libsqlite3"], :libsqlite),
+    LibraryProduct(prefix, "libsqlite3", :libsqlite),
 ]
 
 # Download binaries from hosted location
-bin_prefix = "https://github.com/JuliaDatabases/SQLiteBuilder/releases/download/v0.10.0"
+bin_prefix = "https://github.com/JuliaBinaryWrappers/SQLite_jll.jl/releases/download/SQLite-v3.31.1+0"
 
 # Listing of files generated by BinaryBuilder:
 download_info = Dict(
-    Linux(:aarch64, libc=:glibc) => ("$bin_prefix/SQLite.v3.28.0.aarch64-linux-gnu.tar.gz", "e8bb76f8a86a943d59215b8ec8b2308b08a48c78df5238210e65657da86c67b4"),
-    Linux(:aarch64, libc=:musl) => ("$bin_prefix/SQLite.v3.28.0.aarch64-linux-musl.tar.gz", "41b396e4e3843daed5de52eb0b884de6815e1aeab686fa4742c15c37ffe2a255"),
-    Linux(:armv7l, libc=:glibc, call_abi=:eabihf) => ("$bin_prefix/SQLite.v3.28.0.arm-linux-gnueabihf.tar.gz", "9810741a754f22320ac6cdb5e3723bcd5ba0fef301675282dcc616b1ab2b6a6e"),
-    Linux(:armv7l, libc=:musl, call_abi=:eabihf) => ("$bin_prefix/SQLite.v3.28.0.arm-linux-musleabihf.tar.gz", "c973b1187e2c8de468f0b19a4a5d04e3b276e21c59bee09811418ae15cb83d10"),
-    Linux(:i686, libc=:glibc) => ("$bin_prefix/SQLite.v3.28.0.i686-linux-gnu.tar.gz", "246e50c4412f69a8b127caa5e94d90f1e8674d365e64af42f02c29958fe2ea01"),
-    Linux(:i686, libc=:musl) => ("$bin_prefix/SQLite.v3.28.0.i686-linux-musl.tar.gz", "2028945661a8bd71dcf1b434b5743e9fe4a3e1f74f6ab6c3ae713d212d2670d1"),
-    Windows(:i686) => ("$bin_prefix/SQLite.v3.28.0.i686-w64-mingw32.tar.gz", "a098ed658fb5f3b1194bb880d03069461c98f4179962784de8ee52d406635d44"),
-    Linux(:powerpc64le, libc=:glibc) => ("$bin_prefix/SQLite.v3.28.0.powerpc64le-linux-gnu.tar.gz", "08b8c016d7acb22db0d884cf8c6e992a99158cd6749ef1dd37f0202a4c7e6ade"),
-    MacOS(:x86_64) => ("$bin_prefix/SQLite.v3.28.0.x86_64-apple-darwin14.tar.gz", "046f597b79c53cbfbfd94d6b36fc2e8f2ba77284f10e026464c753a895661b70"),
-    Linux(:x86_64, libc=:glibc) => ("$bin_prefix/SQLite.v3.28.0.x86_64-linux-gnu.tar.gz", "79e1a43df65ed22a3d3401b0607711a570f27f9caeb9d57d3e8ec90384461dd3"),
-    Linux(:x86_64, libc=:musl) => ("$bin_prefix/SQLite.v3.28.0.x86_64-linux-musl.tar.gz", "9267775482078afecde24aa894d165e04123ff47895a01f5047a7333505009a0"),
-    FreeBSD(:x86_64) => ("$bin_prefix/SQLite.v3.28.0.x86_64-unknown-freebsd11.1.tar.gz", "45268da994d260fb322b1e75d4c500c61dd4936de9964911fa98edbde3db08e0"),
-    Windows(:x86_64) => ("$bin_prefix/SQLite.v3.28.0.x86_64-w64-mingw32.tar.gz", "74cc63b003b85de0c0e8406b44310f6443f5f52f40ab61a28829a0e6dfbb4936"),
+    Linux(:aarch64, libc=:glibc) => ("$bin_prefix/SQLite.v3.31.1.aarch64-linux-gnu.tar.gz", "4988c1adca1eefca51738138ba102b4f841e737f68177610746b6a1bc47026b1"),
+    Linux(:aarch64, libc=:musl) => ("$bin_prefix/SQLite.v3.31.1.aarch64-linux-musl.tar.gz", "ff0618c4f01b219dc1767ec86d3845e0d47cd7969f721d52085db10789a605f0"),
+    Linux(:armv7l, libc=:glibc, call_abi=:eabihf) => ("$bin_prefix/SQLite.v3.31.1.armv7l-linux-gnueabihf.tar.gz", "c9c66119e24d83ee440a79668657b54f0398cb2ebf186cd2cc1774e160f43de7"),
+    Linux(:armv7l, libc=:musl, call_abi=:eabihf) => ("$bin_prefix/SQLite.v3.31.1.armv7l-linux-musleabihf.tar.gz", "3cb9654a11b8888b128a7f1e28cb7f585bf2f39121b1b4625c29b9ff4a3912d1"),
+    Linux(:i686, libc=:glibc) => ("$bin_prefix/SQLite.v3.31.1.i686-linux-gnu.tar.gz", "02f29a2b9ebdd8300c513e39c49e6d5c1b1dee46ff7a3df3c31e30fc4c3f4728"),
+    Linux(:i686, libc=:musl) => ("$bin_prefix/SQLite.v3.31.1.i686-linux-musl.tar.gz", "0b211226e2d969e23876cf5a0975dc5a9abc05848349c18e92c6fa4b3147a946"),
+    Windows(:i686) => ("$bin_prefix/SQLite.v3.31.1.i686-w64-mingw32.tar.gz", "e3db972094bcb86c6d3a7a845f14f328999ad380e6bcad53db104a1a48fa05fa"),
+    Linux(:powerpc64le, libc=:glibc) => ("$bin_prefix/SQLite.v3.31.1.powerpc64le-linux-gnu.tar.gz", "88c191f00c801a5701fe00f55db968d9e609de6b19d112721f990e24aabf9334"),
+    MacOS(:x86_64) => ("$bin_prefix/SQLite.v3.31.1.x86_64-apple-darwin14.tar.gz", "3cefd1e9d7c775936aa131515b83ea4cb754af5a4a5a872b4e1a53f1f5c472c1"),
+    Linux(:x86_64, libc=:glibc) => ("$bin_prefix/SQLite.v3.31.1.x86_64-linux-gnu.tar.gz", "ad27dfd75aa8e7d3822d6d7c58a6f0daf94e8e995427a877084cbb4dd466f91a"),
+    Linux(:x86_64, libc=:musl) => ("$bin_prefix/SQLite.v3.31.1.x86_64-linux-musl.tar.gz", "d333808f3437e8d46ef9ea5dcabaa3eb7a101da18064c2bf95f82b8a2a6b4921"),
+    FreeBSD(:x86_64) => ("$bin_prefix/SQLite.v3.31.1.x86_64-unknown-freebsd11.1.tar.gz", "a4c4e34da8cf80047a4ad4764e728541ea9d00274bc59be802b2e567cc871ea7"),
+    Windows(:x86_64) => ("$bin_prefix/SQLite.v3.31.1.x86_64-w64-mingw32.tar.gz", "a3e1fd2ade228a62ca0969632a50a5528e294086ebf515cdc59e384ffb87cfc2"),
 )
 
 # Install unsatisfied or updated dependencies:
@@ -46,3 +48,5 @@ end
 
 # Write out a deps.jl file that will contain mappings for our products
 write_deps_file(joinpath(@__DIR__, "deps.jl"), products, verbose=verbose)
+
+end # VERSION

src/consts.jl

@@ -1,14 +1,17 @@
-# Load libcurl libraries from our deps.jl
+if VERSION < v"1.3.0"
+
+    # Load libmariadb from our deps.jl
 const depsjl_path = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
 if !isfile(depsjl_path)
     error("SQLite not installed properly, run Pkg.build(\"SQLite\"), restart Julia and try again")
 end
 include(depsjl_path)
 
-function __init__()
-    check_deps()  # Always check your dependencies from `deps.jl`
-end
+else
 
+using SQLite_jll
+
+end
 
 #Macros
 macro OK(func)