diff --git a/mix.exs b/mix.exs index 85b2a2f..8e658f3 100644 --- a/mix.exs +++ b/mix.exs @@ -22,10 +22,8 @@ defmodule Imageflow.MixProject do # Run "mix help deps" to learn about dependencies. defp deps do [ - {:rustler, github: "hansihe/rustler", sparse: "rustler_mix"}, + {:rustler, "~> 0.21.0"}, {:jason, "~> 1.2"} - # {:dep_from_hexpm, "~> 0.3.0"}, - # {:dep_from_git, git: "https://github.com/elixir-lang/my_dep.git", tag: "0.1.0"} ] end diff --git a/mix.lock b/mix.lock index 78a3af9..6cd1617 100644 --- a/mix.lock +++ b/mix.lock @@ -1,5 +1,5 @@ %{ "jason": {:hex, :jason, "1.2.2", "ba43e3f2709fd1aa1dce90aaabfd039d000469c05c56f0b8e31978e03fa39052", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "18a228f5f0058ee183f29f9eae0805c6e59d61c3b006760668d8d18ff0d12179"}, - "rustler": {:git, "https://github.com/hansihe/rustler.git", "fa221b9292332955ece4d5733e61cf9054efbc23", [sparse: "rustler_mix"]}, + "rustler": {:hex, :rustler, "0.21.1", "5299980be32da997c54382e945bacaa015ed97a60745e1e639beaf6a7b278c65", [:mix], [{:toml, "~> 0.5.2", [hex: :toml, repo: "hexpm", optional: false]}], "hexpm", "6ee1651e10645b2b2f3bb70502bf180341aa058709177e9bc28c105934094bc6"}, "toml": {:hex, :toml, "0.5.2", "e471388a8726d1ce51a6b32f864b8228a1eb8edc907a0edf2bb50eab9321b526", [:mix], [], "hexpm", "f1e3dabef71fb510d015fad18c0e05e7c57281001141504c6b69d94e99750a07"}, } diff --git a/native/imageflow_ex/Cargo.lock b/native/imageflow_ex/Cargo.lock index 34e3a0b..2eb2cb5 100644 --- a/native/imageflow_ex/Cargo.lock +++ b/native/imageflow_ex/Cargo.lock @@ -460,6 +460,7 @@ checksum = "9007da9cacbd3e6343da136e98b0d2df013f553d35bdec8b518f07bea768e19c" [[package]] name = "imageflow_c_components" version = "0.1.0" +source = "git+https://github.com/imazen/imageflow?tag=v1.5.3-rc57#478fafef4c83446f9415b7502f6a6712af00cf32" dependencies = [ "cc", "glob", @@ -473,6 +474,7 @@ dependencies = [ [[package]] name = "imageflow_core" version = "0.1.0" +source = "git+https://github.com/imazen/imageflow?tag=v1.5.3-rc57#478fafef4c83446f9415b7502f6a6712af00cf32" dependencies = [ "blake2-rfc", "byteorder", @@ -532,6 +534,7 @@ dependencies = [ [[package]] name = "imageflow_helpers" version = "0.1.0" +source = "git+https://github.com/imazen/imageflow?tag=v1.5.3-rc57#478fafef4c83446f9415b7502f6a6712af00cf32" dependencies = [ "backtrace", "base64", @@ -543,6 +546,7 @@ dependencies = [ "libc", "rand 0.4.6", "regex", + "rgb", "rustc-serialize", "serde", "serde_derive", @@ -559,6 +563,7 @@ dependencies = [ [[package]] name = "imageflow_riapi" version = "0.1.0" +source = "git+https://github.com/imazen/imageflow?tag=v1.5.3-rc57#478fafef4c83446f9415b7502f6a6712af00cf32" dependencies = [ "enum_derive", "ieee754", @@ -574,6 +579,7 @@ dependencies = [ [[package]] name = "imageflow_types" version = "0.1.0" +source = "git+https://github.com/imazen/imageflow?tag=v1.5.3-rc57#478fafef4c83446f9415b7502f6a6712af00cf32" dependencies = [ "chrono", "imageflow_helpers", diff --git a/native/imageflow_ex/Cargo.toml b/native/imageflow_ex/Cargo.toml index ad7e5df..eaa8714 100644 --- a/native/imageflow_ex/Cargo.toml +++ b/native/imageflow_ex/Cargo.toml @@ -12,7 +12,5 @@ crate-type = ["dylib"] [dependencies] rustler = "0.21.1" lazy_static = "1.0" -# imageflow_core = { git = "https://github.com/imazen/imageflow", tag = "v1.5.3-rc57" } -# imageflow_types = { git = "https://github.com/imazen/imageflow", tag = "v1.5.3-rc57" } -imageflow_core = { path = "../../../../contrib/imageflow/imageflow_core" } -imageflow_types = { path = "../../../../contrib/imageflow/imageflow_types" } +imageflow_core = { git = "https://github.com/imazen/imageflow", tag = "v1.5.3-rc57" } +imageflow_types = { git = "https://github.com/imazen/imageflow", tag = "v1.5.3-rc57" }