Merge pull request #104 from staticfloat/sf/13_reasons_why

Upgrade to Julia 1.3+

.travis.yml

@@ -1,26 +1,16 @@
 language: julia
 os:
-    - osx
-    - linux
+  - osx
+  - linux
+  - windows
 
 julia:
-    - 0.7
-    - 1.0
-    - nightly
-
-# # uncomment the following lines to allow failures on nightly julia
-# # (tests will run but not make your overall status red)
-# matrix:
-#   allow_failures:
-#   - julia: 0.7
-#   - julia: 1.0
-#   - julia: nightly
+  - 1.3
+  - 1.4
+  - nightly
 
 notifications:
-    email: false
+  email: false
 
 after_success:
-    # submit test coverage
-    - cd ${TRAVIS_BUILD_DIR}
-    - julia -e 'using Pkg; Pkg.add("Coverage")'
-    - julia -e 'using Coverage; Coveralls.submit(Coveralls.process_folder())'
+  - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())';

Manifest.toml

@@ -0,0 +1,70 @@
+# This file is machine-generated - editing it directly is not advised
+
+[[Base64]]
+uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+
+[[Dates]]
+deps = ["Printf"]
+uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
+
+[[GMP_jll]]
+deps = ["Libdl", "Pkg"]
+git-tree-sha1 = "4dd9301d3a027c05ec403e756ee7a60e3c367e5d"
+uuid = "781609d7-10c4-51f6-84f2-b8444358ff6d"
+version = "6.1.2+5"
+
+[[InteractiveUtils]]
+deps = ["Markdown"]
+uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+
+[[LibGit2]]
+deps = ["Printf"]
+uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
+
+[[Libdl]]
+uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+
+[[Logging]]
+uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
+
+[[Markdown]]
+deps = ["Base64"]
+uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
+
+[[Nettle_jll]]
+deps = ["GMP_jll", "Libdl", "Pkg"]
+git-tree-sha1 = "10e4a49e5f6324b30e1d86ba024dd3a8afae59df"
+uuid = "4c82536e-c426-54e4-b420-14f461c4ed8b"
+version = "3.4.1+0"
+
+[[Pkg]]
+deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
+uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+
+[[Printf]]
+deps = ["Unicode"]
+uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+
+[[REPL]]
+deps = ["InteractiveUtils", "Markdown", "Sockets"]
+uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
+
+[[Random]]
+deps = ["Serialization"]
+uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+
+[[SHA]]
+uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
+
+[[Serialization]]
+uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+
+[[Sockets]]
+uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
+
+[[UUIDs]]
+deps = ["Random", "SHA"]
+uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
+
+[[Unicode]]
+uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"

Project.toml

@@ -0,0 +1,17 @@
+name = "Nettle"
+uuid = "49dea1ee-f6fa-5aa6-9a11-8816cee7d4b9"
+authors = ["Elliot Saba <staticfloat@gmail.com>"]
+version = "0.5.0"
+
+[deps]
+Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+Nettle_jll = "4c82536e-c426-54e4-b420-14f461c4ed8b"
+
+[compat]
+julia = "1.3"
+
+[extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Test"]

src/Nettle.jl

@@ -1,22 +1,11 @@
 module Nettle
-
-# Load libnettle from our deps.jl
-const depsjl_path = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
-if !isfile(depsjl_path)
-    error("Nettle not installed properly, run Pkg.build(\"Nettle\"), restart Julia and try again")
-end
-include(depsjl_path)
+using Nettle_jll, Libdl
 
 include("hash_common.jl")
 include("hash.jl")
 include("hmac.jl")
 include("cipher.jl")
 
-function __init__()
-    # Always check your dependencies that live in `deps.jl`
-    check_deps()
-end
-
 # SnoopCompile acceleration
 include("precompile.jl")
 _precompile_()

src/precompile.jl

@@ -22,5 +22,4 @@ function _precompile_()
     precompile(Nettle.update!, (Nettle.HMACState, String,))
     precompile(Nettle.encrypt, (String, Vector{UInt8}, Vector{UInt8},))
     precompile(Nettle.hexdigest!, (Nettle.Hasher,))
-    precompile(Nettle.__init__, ())
 end