Merge pull request #107 from aviks/as/jll

Move to using jlls
JuliaIO · Mar 27, 2020 · 2b5a2fb · 2b5a2fb · omus · Mar 27, 2020
2 parents 666caa7 + 768d387
commit 2b5a2fb
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 124 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -4,8 +4,8 @@ task:
   name: FreeBSD
   env:
     matrix:
-      - JULIA_VERSION: 1.0
-      - JULIA_VERSION: 1.2
+      - JULIA_VERSION: 1.3
+      - JULIA_VERSION: 1.4
       - JULIA_VERSION: nightly
   allow_failures: $JULIA_VERSION == "nightly"
   install_script:

diff --git a/.drone.yml b/.drone.yml
@@ -1,61 +1,61 @@
 kind: pipeline
-name: linux-arm-1.0
+name: linux-arm-1.3
 
 platform:
  os: linux
  arch: arm
 
 steps:
 - name: build
-  image: julia:1.0
+  image: julia:1.3
   commands:
      - uname -a
      - julia --project=. -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'
 
 ---
 
 kind: pipeline
-name: linux-aarch64-1.0
+name: linux-aarch64-1.3
 
 platform:
   os: linux
   arch: arm64
 
 steps:
 - name: build
-  image: julia:1.0
+  image: julia:1.3
   commands:
       - uname -a
       - julia --project=. -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'
 
 ---
 
 kind: pipeline
-name: linux-arm-1.2
+name: linux-arm-1.4
 
 platform:
  os: linux
  arch: arm
 
 steps:
 - name: build
-  image: julia:1.2
+  image: julia:1.4
   commands:
      - uname -a
      - julia --project=. -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'
 
 ---
 
 kind: pipeline
-name: linux-aarch64-1.2
+name: linux-aarch64-1.4
 
 platform:
   os: linux
   arch: arm64
 
 steps:
 - name: build
-  image: julia:1.2
+  image: julia:1.4
   commands:
       - uname -a
       - julia --project=. -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,8 @@ os:
   - linux
   - osx
 julia:
-  - 1.0
-  - 1.2
+  - 1.3
+  - 1.4
   - nightly
 notifications:
     email: false

diff --git a/Project.toml b/Project.toml
@@ -1,13 +1,13 @@
 name = "LightXML"
 uuid = "9c8b4983-aa76-5018-a973-4c85ecc9e179"
-version = "0.8.1"
+version = "0.9.0"
 
 [deps]
-BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+XML2_jll = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a"
 
 [compat]
-julia = "0.7, 1"
+julia = "1.3"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 environment:
   matrix:
-  - julia_version: 1
-  - julia_version: 1.2
+  - julia_version: 1.3
+  - julia_version: 1.4
   - julia_version: nightly
 
 platform:

diff --git a/deps/build.jl b/deps/build.jl
diff --git a/deps/build_XML2Builder.v2.9.9.jl b/deps/build_XML2Builder.v2.9.9.jl
diff --git a/deps/build_Zlib.v1.2.11.jl b/deps/build_Zlib.v1.2.11.jl
diff --git a/src/LightXML.jl b/src/LightXML.jl
@@ -1,14 +1,6 @@
 
 module LightXML
-
-let depsfile = joinpath(@__DIR__, "..", "deps", "deps.jl")
-    if !isfile(depsfile)
-        error("LightXML is not properly installed. Run `Pkg.build(\"LightXML\")` and " *
-              "restart Julia.")
-    end
-    include(depsfile)
-end
-check_deps()
+using XML2_jll
 
 export
     # common
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,8 +3,8 @@ os: @@
       - linux
       - osx
     julia:
-      - 1.0
-      - 1.2
+      - 1.3
+      - 1.4
       - nightly
     notifications:
         email: false
@@ Expand Down @@