From 17a852bf305c5a6477cc7c891092a4d02b2a81f6 Mon Sep 17 00:00:00 2001 From: Ianko Leite Date: Tue, 21 Jan 2025 17:37:32 -0500 Subject: [PATCH 1/7] remove googleapis submodule --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index c2c6ac4..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "googleapis"] - path = examples/helloworld/priv/protos/googleapis - url = https://github.com/googleapis/googleapis.git From bde0ba7488884e5a41cb5cefd9a4518a4d0f515b Mon Sep 17 00:00:00 2001 From: Ianko Leite Date: Tue, 21 Jan 2025 18:02:03 -0500 Subject: [PATCH 2/7] update deps --- examples/helloworld/mix.exs | 5 ++--- examples/helloworld/mix.lock | 16 ++++++++-------- mix.exs | 5 ++--- mix.lock | 11 +++++------ 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/examples/helloworld/mix.exs b/examples/helloworld/mix.exs index 4edeafe..c079a48 100644 --- a/examples/helloworld/mix.exs +++ b/examples/helloworld/mix.exs @@ -18,11 +18,10 @@ defmodule Helloworld.Mixfile do defp deps do [ - {:grpc, "~> 0.7"}, + {:grpc, "~> 0.9"}, {:grpc_reflection, path: "../.."}, - {:protobuf, "~> 0.11"}, + {:protobuf, "~> 0.14"}, {:dialyxir, "~> 1.1", only: [:dev, :test], runtime: false}, - {:google_protos, "~> 0.4.0"}, {:protobuf_generate, "~> 0.1.0"} ] end diff --git a/examples/helloworld/mix.lock b/examples/helloworld/mix.lock index e1650aa..80c4aa7 100644 --- a/examples/helloworld/mix.lock +++ b/examples/helloworld/mix.lock @@ -1,15 +1,15 @@ %{ - "cowboy": {:hex, :cowboy, "2.10.0", "ff9ffeff91dae4ae270dd975642997afe2a1179d94b1887863e43f681a203e26", [:make, :rebar3], [{:cowlib, "2.12.1", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b"}, - "cowlib": {:hex, :cowlib, "2.12.1", "a9fa9a625f1d2025fe6b462cb865881329b5caff8f1854d1cbc9f9533f00e1e1", [:make, :rebar3], [], "hexpm", "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"}, + "cowboy": {:hex, :cowboy, "2.12.0", "f276d521a1ff88b2b9b4c54d0e753da6c66dd7be6c9fca3d9418b561828a3731", [:make, :rebar3], [{:cowlib, "2.13.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "8a7abe6d183372ceb21caa2709bec928ab2b72e18a3911aa1771639bef82651e"}, + "cowlib": {:hex, :cowlib, "2.13.0", "db8f7505d8332d98ef50a3ef34b34c1afddec7506e4ee4dd4a3a266285d282ca", [:make, :rebar3], [], "hexpm", "e1e1284dc3fc030a64b1ad0d8382ae7e99da46c3246b815318a4b848873800a4"}, "dialyxir": {:hex, :dialyxir, "1.4.2", "764a6e8e7a354f0ba95d58418178d486065ead1f69ad89782817c296d0d746a5", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "516603d8067b2fd585319e4b13d3674ad4f314a5902ba8130cd97dc902ce6bbd"}, "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"}, "google_protos": {:hex, :google_protos, "0.4.0", "93e1be2c1a07517ffed761f69047776caf35e4acd385aac4f5ce4fedd07f3660", [:mix], [{:protobuf, "~> 0.10", [hex: :protobuf, repo: "hexpm", optional: false]}], "hexpm", "4c54983d78761a3643e2198adf0f5d40a5a8b08162f3fc91c50faa257f3fa19f"}, - "grpc": {:hex, :grpc, "0.7.0", "a86eab356b0b84406b526786a947ca50e9b9eae87108c873b51e321f8a71e8ed", [:mix], [{:cowboy, "~> 2.10", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowlib, "~> 2.12", [hex: :cowlib, repo: "hexpm", optional: false]}, {:gun, "~> 2.0", [hex: :gun, repo: "hexpm", optional: false]}, {:mint, "~> 1.5", [hex: :mint, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "632a9507da8d3c12b112b197db4d60da3c95bad02594d37711eeb622d032f254"}, - "gun": {:hex, :gun, "2.0.1", "160a9a5394800fcba41bc7e6d421295cf9a7894c2252c0678244948e3336ad73", [:make, :rebar3], [{:cowlib, "2.12.1", [hex: :cowlib, repo: "hexpm", optional: false]}], "hexpm", "a10bc8d6096b9502205022334f719cc9a08d9adcfbfc0dbee9ef31b56274a20b"}, - "hpax": {:hex, :hpax, "0.1.2", "09a75600d9d8bbd064cdd741f21fc06fc1f4cf3d0fcc335e5aa19be1a7235c84", [:mix], [], "hexpm", "2c87843d5a23f5f16748ebe77969880e29809580efdaccd615cd3bed628a8c13"}, - "mint": {:hex, :mint, "1.5.1", "8db5239e56738552d85af398798c80648db0e90f343c8469f6c6d8898944fb6f", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "4a63e1e76a7c3956abd2c72f370a0d0aecddc3976dea5c27eccbecfa5e7d5b1e"}, - "protobuf": {:hex, :protobuf, "0.12.0", "58c0dfea5f929b96b5aa54ec02b7130688f09d2de5ddc521d696eec2a015b223", [:mix], [{:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "75fa6cbf262062073dd51be44dd0ab940500e18386a6c4e87d5819a58964dc45"}, + "grpc": {:hex, :grpc, "0.9.0", "1b930a57272d4356ea65969b984c2eb04f3dab81420e1e28f0e6ec04b8f88515", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:cowboy, "~> 2.10", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowlib, "~> 2.12", [hex: :cowlib, repo: "hexpm", optional: false]}, {:gun, "~> 2.0", [hex: :gun, repo: "hexpm", optional: false]}, {:jason, ">= 0.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mint, "~> 1.5", [hex: :mint, repo: "hexpm", optional: false]}, {:protobuf, "~> 0.11", [hex: :protobuf, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7c059698248738fcf7ad551f1d78f4a3d2e0642a72a5834f2a0b0db4b9f3d2b5"}, + "gun": {:hex, :gun, "2.1.0", "b4e4cbbf3026d21981c447e9e7ca856766046eff693720ba43114d7f5de36e87", [:make, :rebar3], [{:cowlib, "2.13.0", [hex: :cowlib, repo: "hexpm", optional: false]}], "hexpm", "52fc7fc246bfc3b00e01aea1c2854c70a366348574ab50c57dfe796d24a0101d"}, + "hpax": {:hex, :hpax, "1.0.2", "762df951b0c399ff67cc57c3995ec3cf46d696e41f0bba17da0518d94acd4aac", [:mix], [], "hexpm", "2f09b4c1074e0abd846747329eaa26d535be0eb3d189fa69d812bfb8bfefd32f"}, + "mint": {:hex, :mint, "1.6.2", "af6d97a4051eee4f05b5500671d47c3a67dac7386045d87a904126fd4bbcea2e", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1 or ~> 0.2.0 or ~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "5ee441dffc1892f1ae59127f74afe8fd82fda6587794278d924e4d90ea3d63f9"}, + "protobuf": {:hex, :protobuf, "0.14.0", "75b64b8c1f0c833b5e76cd841d3448f077f655c2a2eed53358651fbfe4a6b70e", [:mix], [{:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0f747eaa54ace9617536f1cb4b2a4962bc7e43f1aa475c6fa9c60079955c4cb0"}, "protobuf_generate": {:hex, :protobuf_generate, "0.1.2", "45b9a9ae8606333cdea993ceaaecd799d206cdfe23348d37c06207eac76cbee6", [:mix], [{:protobuf, "~> 0.12", [hex: :protobuf, repo: "hexpm", optional: false]}], "hexpm", "55b0ff8385703317ca90e1bd30a2ece99e80ae0c73e6ebcfb374e84e57870d61"}, "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"}, - "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"}, + "telemetry": {:hex, :telemetry, "1.3.0", "fedebbae410d715cf8e7062c96a1ef32ec22e764197f70cda73d82778d61e7a2", [:rebar3], [], "hexpm", "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"}, } diff --git a/mix.exs b/mix.exs index f4e1f2f..4654de9 100644 --- a/mix.exs +++ b/mix.exs @@ -44,9 +44,8 @@ defmodule GrpcReflection.MixProject do {:credo, "~> 1.7", only: [:dev, :test], runtime: false}, {:dialyxir, "~> 1.4", only: [:dev, :test], runtime: false}, {:ex_doc, ">= 0.0.0", only: :dev, runtime: false}, - {:google_protos, "~> 0.4.0"}, - {:grpc, "~> 0.7"}, - {:protobuf, "~> 0.11"} + {:grpc, "~> 0.9"}, + {:protobuf, "~> 0.14"} ] end diff --git a/mix.lock b/mix.lock index df5c17b..e4be6bf 100644 --- a/mix.lock +++ b/mix.lock @@ -8,17 +8,16 @@ "erlex": {:hex, :erlex, "0.2.7", "810e8725f96ab74d17aac676e748627a07bc87eb950d2b83acd29dc047a30595", [:mix], [], "hexpm", "3ed95f79d1a844c3f6bf0cea61e0d5612a42ce56da9c03f01df538685365efb0"}, "ex_doc": {:hex, :ex_doc, "0.36.1", "4197d034f93e0b89ec79fac56e226107824adcce8d2dd0a26f5ed3a95efc36b1", [:mix], [{:earmark_parser, "~> 1.4.42", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "d7d26a7cf965dacadcd48f9fa7b5953d7d0cfa3b44fa7a65514427da44eafd89"}, "file_system": {:hex, :file_system, "1.1.0", "08d232062284546c6c34426997dd7ef6ec9f8bbd090eb91780283c9016840e8f", [:mix], [], "hexpm", "bfcf81244f416871f2a2e15c1b515287faa5db9c6bcf290222206d120b3d43f6"}, - "google_protos": {:hex, :google_protos, "0.4.0", "93e1be2c1a07517ffed761f69047776caf35e4acd385aac4f5ce4fedd07f3660", [:mix], [{:protobuf, "~> 0.10", [hex: :protobuf, repo: "hexpm", optional: false]}], "hexpm", "4c54983d78761a3643e2198adf0f5d40a5a8b08162f3fc91c50faa257f3fa19f"}, - "grpc": {:hex, :grpc, "0.8.1", "a8a5884a0d41fc30679c269d0332571cebb43cbfd6eb3d4819169778e866343e", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:cowboy, "~> 2.10", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowlib, "~> 2.12", [hex: :cowlib, repo: "hexpm", optional: false]}, {:gun, "~> 2.0", [hex: :gun, repo: "hexpm", optional: false]}, {:jason, ">= 0.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mint, "~> 1.5", [hex: :mint, repo: "hexpm", optional: false]}, {:protobuf, "~> 0.11", [hex: :protobuf, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1cccd9fd83547a562f315cc0e1ee1879546f0a44193b5c8eb8d68dae0bb2065b"}, + "grpc": {:hex, :grpc, "0.9.0", "1b930a57272d4356ea65969b984c2eb04f3dab81420e1e28f0e6ec04b8f88515", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:cowboy, "~> 2.10", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowlib, "~> 2.12", [hex: :cowlib, repo: "hexpm", optional: false]}, {:gun, "~> 2.0", [hex: :gun, repo: "hexpm", optional: false]}, {:jason, ">= 0.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mint, "~> 1.5", [hex: :mint, repo: "hexpm", optional: false]}, {:protobuf, "~> 0.11", [hex: :protobuf, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7c059698248738fcf7ad551f1d78f4a3d2e0642a72a5834f2a0b0db4b9f3d2b5"}, "gun": {:hex, :gun, "2.1.0", "b4e4cbbf3026d21981c447e9e7ca856766046eff693720ba43114d7f5de36e87", [:make, :rebar3], [{:cowlib, "2.13.0", [hex: :cowlib, repo: "hexpm", optional: false]}], "hexpm", "52fc7fc246bfc3b00e01aea1c2854c70a366348574ab50c57dfe796d24a0101d"}, - "hpax": {:hex, :hpax, "0.2.0", "5a58219adcb75977b2edce5eb22051de9362f08236220c9e859a47111c194ff5", [:mix], [], "hexpm", "bea06558cdae85bed075e6c036993d43cd54d447f76d8190a8db0dc5893fa2f1"}, + "hpax": {:hex, :hpax, "1.0.2", "762df951b0c399ff67cc57c3995ec3cf46d696e41f0bba17da0518d94acd4aac", [:mix], [], "hexpm", "2f09b4c1074e0abd846747329eaa26d535be0eb3d189fa69d812bfb8bfefd32f"}, "jason": {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"}, "makeup": {:hex, :makeup, "1.2.1", "e90ac1c65589ef354378def3ba19d401e739ee7ee06fb47f94c687016e3713d1", [:mix], [{:nimble_parsec, "~> 1.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "d36484867b0bae0fea568d10131197a4c2e47056a6fbe84922bf6ba71c8d17ce"}, "makeup_elixir": {:hex, :makeup_elixir, "1.0.1", "e928a4f984e795e41e3abd27bfc09f51db16ab8ba1aebdba2b3a575437efafc2", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "7284900d412a3e5cfd97fdaed4f5ed389b8f2b4cb49efc0eb3bd10e2febf9507"}, "makeup_erlang": {:hex, :makeup_erlang, "1.0.1", "c7f58c120b2b5aa5fd80d540a89fdf866ed42f1f3994e4fe189abebeab610839", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "8a89a1eeccc2d798d6ea15496a6e4870b75e014d1af514b1b71fa33134f57814"}, - "mint": {:hex, :mint, "1.6.0", "88a4f91cd690508a04ff1c3e28952f322528934be541844d54e0ceb765f01d5e", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1 or ~> 0.2.0", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "3c5ae85d90a5aca0a49c0d8b67360bbe407f3b54f1030a111047ff988e8fefaa"}, + "mint": {:hex, :mint, "1.6.2", "af6d97a4051eee4f05b5500671d47c3a67dac7386045d87a904126fd4bbcea2e", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1 or ~> 0.2.0 or ~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "5ee441dffc1892f1ae59127f74afe8fd82fda6587794278d924e4d90ea3d63f9"}, "nimble_parsec": {:hex, :nimble_parsec, "1.4.1", "f41275a0354c736db4b1d255b5d2a27c91028e55c21ea3145b938e22649ffa3f", [:mix], [], "hexpm", "605e44204998f138d6e13be366c8e81af860e726c8177caf50067e1b618fe522"}, - "protobuf": {:hex, :protobuf, "0.12.0", "58c0dfea5f929b96b5aa54ec02b7130688f09d2de5ddc521d696eec2a015b223", [:mix], [{:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "75fa6cbf262062073dd51be44dd0ab940500e18386a6c4e87d5819a58964dc45"}, + "protobuf": {:hex, :protobuf, "0.14.0", "75b64b8c1f0c833b5e76cd841d3448f077f655c2a2eed53358651fbfe4a6b70e", [:mix], [{:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0f747eaa54ace9617536f1cb4b2a4962bc7e43f1aa475c6fa9c60079955c4cb0"}, "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"}, - "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"}, + "telemetry": {:hex, :telemetry, "1.3.0", "fedebbae410d715cf8e7062c96a1ef32ec22e764197f70cda73d82778d61e7a2", [:rebar3], [], "hexpm", "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"}, } From 4690f419b91327cddefc709f69ea10640af9b2a8 Mon Sep 17 00:00:00 2001 From: Ianko Leite Date: Tue, 21 Jan 2025 18:02:38 -0500 Subject: [PATCH 3/7] remove protobuf_generate --- examples/helloworld/generate_protos.sh | 20 +++++--------------- examples/helloworld/mix.exs | 3 +-- examples/helloworld/mix.lock | 2 -- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/examples/helloworld/generate_protos.sh b/examples/helloworld/generate_protos.sh index f15ed16..2c11ece 100755 --- a/examples/helloworld/generate_protos.sh +++ b/examples/helloworld/generate_protos.sh @@ -1,17 +1,7 @@ #!/bin/bash -PROTOS=(" - priv/protos/helloworld.proto -") - -for file in $PROTOS; do - mix protobuf.generate \ - --output-path=./lib/protos \ - --include-docs=true \ - --generate-descriptors=true \ - --include-path=priv/protos/ \ - --include-path=./priv/protos/googleapis \ - --plugin=ProtobufGenerate.Plugins.GRPC \ - --one-file-per-module \ - $file -done +protoc -I priv/protos \ + --elixir_out=plugins=grpc:./lib/protos \ + --elixir_opt=include_docs=true \ + --elixir_out=plugins=grpc,gen_descriptors=true:lib/protos \ + priv/protos/*.proto \ No newline at end of file diff --git a/examples/helloworld/mix.exs b/examples/helloworld/mix.exs index c079a48..7e820a2 100644 --- a/examples/helloworld/mix.exs +++ b/examples/helloworld/mix.exs @@ -21,8 +21,7 @@ defmodule Helloworld.Mixfile do {:grpc, "~> 0.9"}, {:grpc_reflection, path: "../.."}, {:protobuf, "~> 0.14"}, - {:dialyxir, "~> 1.1", only: [:dev, :test], runtime: false}, - {:protobuf_generate, "~> 0.1.0"} + {:dialyxir, "~> 1.1", only: [:dev, :test], runtime: false} ] end end diff --git a/examples/helloworld/mix.lock b/examples/helloworld/mix.lock index 80c4aa7..f59d996 100644 --- a/examples/helloworld/mix.lock +++ b/examples/helloworld/mix.lock @@ -3,13 +3,11 @@ "cowlib": {:hex, :cowlib, "2.13.0", "db8f7505d8332d98ef50a3ef34b34c1afddec7506e4ee4dd4a3a266285d282ca", [:make, :rebar3], [], "hexpm", "e1e1284dc3fc030a64b1ad0d8382ae7e99da46c3246b815318a4b848873800a4"}, "dialyxir": {:hex, :dialyxir, "1.4.2", "764a6e8e7a354f0ba95d58418178d486065ead1f69ad89782817c296d0d746a5", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "516603d8067b2fd585319e4b13d3674ad4f314a5902ba8130cd97dc902ce6bbd"}, "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"}, - "google_protos": {:hex, :google_protos, "0.4.0", "93e1be2c1a07517ffed761f69047776caf35e4acd385aac4f5ce4fedd07f3660", [:mix], [{:protobuf, "~> 0.10", [hex: :protobuf, repo: "hexpm", optional: false]}], "hexpm", "4c54983d78761a3643e2198adf0f5d40a5a8b08162f3fc91c50faa257f3fa19f"}, "grpc": {:hex, :grpc, "0.9.0", "1b930a57272d4356ea65969b984c2eb04f3dab81420e1e28f0e6ec04b8f88515", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:cowboy, "~> 2.10", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowlib, "~> 2.12", [hex: :cowlib, repo: "hexpm", optional: false]}, {:gun, "~> 2.0", [hex: :gun, repo: "hexpm", optional: false]}, {:jason, ">= 0.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mint, "~> 1.5", [hex: :mint, repo: "hexpm", optional: false]}, {:protobuf, "~> 0.11", [hex: :protobuf, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7c059698248738fcf7ad551f1d78f4a3d2e0642a72a5834f2a0b0db4b9f3d2b5"}, "gun": {:hex, :gun, "2.1.0", "b4e4cbbf3026d21981c447e9e7ca856766046eff693720ba43114d7f5de36e87", [:make, :rebar3], [{:cowlib, "2.13.0", [hex: :cowlib, repo: "hexpm", optional: false]}], "hexpm", "52fc7fc246bfc3b00e01aea1c2854c70a366348574ab50c57dfe796d24a0101d"}, "hpax": {:hex, :hpax, "1.0.2", "762df951b0c399ff67cc57c3995ec3cf46d696e41f0bba17da0518d94acd4aac", [:mix], [], "hexpm", "2f09b4c1074e0abd846747329eaa26d535be0eb3d189fa69d812bfb8bfefd32f"}, "mint": {:hex, :mint, "1.6.2", "af6d97a4051eee4f05b5500671d47c3a67dac7386045d87a904126fd4bbcea2e", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1 or ~> 0.2.0 or ~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "5ee441dffc1892f1ae59127f74afe8fd82fda6587794278d924e4d90ea3d63f9"}, "protobuf": {:hex, :protobuf, "0.14.0", "75b64b8c1f0c833b5e76cd841d3448f077f655c2a2eed53358651fbfe4a6b70e", [:mix], [{:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0f747eaa54ace9617536f1cb4b2a4962bc7e43f1aa475c6fa9c60079955c4cb0"}, - "protobuf_generate": {:hex, :protobuf_generate, "0.1.2", "45b9a9ae8606333cdea993ceaaecd799d206cdfe23348d37c06207eac76cbee6", [:mix], [{:protobuf, "~> 0.12", [hex: :protobuf, repo: "hexpm", optional: false]}], "hexpm", "55b0ff8385703317ca90e1bd30a2ece99e80ae0c73e6ebcfb374e84e57870d61"}, "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"}, "telemetry": {:hex, :telemetry, "1.3.0", "fedebbae410d715cf8e7062c96a1ef32ec22e764197f70cda73d82778d61e7a2", [:rebar3], [], "hexpm", "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"}, } From dd408b277b32d83502e0056ecf86b6cef8bce0e8 Mon Sep 17 00:00:00 2001 From: Ianko Leite Date: Tue, 21 Jan 2025 18:03:10 -0500 Subject: [PATCH 4/7] regenerate protos --- .../helloworld/lib/protos/helloworld.pb.ex | 445 ++---------------- 1 file changed, 34 insertions(+), 411 deletions(-) diff --git a/examples/helloworld/lib/protos/helloworld.pb.ex b/examples/helloworld/lib/protos/helloworld.pb.ex index 517e75d..76f9daf 100644 --- a/examples/helloworld/lib/protos/helloworld.pb.ex +++ b/examples/helloworld/lib/protos/helloworld.pb.ex @@ -1,6 +1,9 @@ defmodule Helloworld.HelloRequest do - @moduledoc false - use Protobuf, protoc_gen_elixir_version: "0.12.0", syntax: :proto3 + @moduledoc """ + The request message containing the user's name. + """ + + use Protobuf, protoc_gen_elixir_version: "0.14.0", syntax: :proto3 def descriptor do # credo:disable-for-next-line @@ -38,8 +41,11 @@ defmodule Helloworld.HelloRequest do end defmodule Helloworld.HelloReply do - @moduledoc false - use Protobuf, protoc_gen_elixir_version: "0.12.0", syntax: :proto3 + @moduledoc """ + The response message containing the greetings + """ + + use Protobuf, protoc_gen_elixir_version: "0.14.0", syntax: :proto3 def descriptor do # credo:disable-for-next-line @@ -92,418 +98,35 @@ defmodule Helloworld.HelloReply do end defmodule Helloworld.Greeter.Service do - use GRPC.Service, name: "helloworld.Greeter", protoc_gen_elixir_version: "0.12.0" + @moduledoc """ + The greeting service definition. + """ + + use GRPC.Service, name: "helloworld.Greeter", protoc_gen_elixir_version: "0.14.0" def descriptor do # credo:disable-for-next-line - %Google.Protobuf.FileDescriptorProto{ - name: "helloworld.proto", - package: "helloworld", - dependency: ["google/protobuf/timestamp.proto"], - message_type: [ - %Google.Protobuf.DescriptorProto{ - name: "HelloRequest", - field: [ - %Google.Protobuf.FieldDescriptorProto{ - name: "name", - extendee: nil, - number: 1, - label: :LABEL_OPTIONAL, - type: :TYPE_STRING, - type_name: nil, - default_value: nil, - options: nil, - oneof_index: nil, - json_name: "name", - proto3_optional: nil, - __unknown_fields__: [] - } - ], - nested_type: [], - enum_type: [], - extension_range: [], - extension: [], - options: nil, - oneof_decl: [], - reserved_range: [], - reserved_name: [], - __unknown_fields__: [] - }, - %Google.Protobuf.DescriptorProto{ - name: "HelloReply", - field: [ - %Google.Protobuf.FieldDescriptorProto{ - name: "message", - extendee: nil, - number: 1, - label: :LABEL_OPTIONAL, - type: :TYPE_STRING, - type_name: nil, - default_value: nil, - options: nil, - oneof_index: nil, - json_name: "message", - proto3_optional: nil, - __unknown_fields__: [] - }, - %Google.Protobuf.FieldDescriptorProto{ - name: "today", - extendee: nil, - number: 2, - label: :LABEL_OPTIONAL, - type: :TYPE_MESSAGE, - type_name: ".google.protobuf.Timestamp", - default_value: nil, - options: nil, - oneof_index: nil, - json_name: "today", - proto3_optional: nil, - __unknown_fields__: [] - } - ], - nested_type: [], - enum_type: [], - extension_range: [], - extension: [], - options: nil, - oneof_decl: [], - reserved_range: [], - reserved_name: [], + %Google.Protobuf.ServiceDescriptorProto{ + name: "Greeter", + method: [ + %Google.Protobuf.MethodDescriptorProto{ + name: "SayHello", + input_type: ".helloworld.HelloRequest", + output_type: ".helloworld.HelloReply", + options: %Google.Protobuf.MethodOptions{ + deprecated: false, + idempotency_level: :IDEMPOTENCY_UNKNOWN, + features: nil, + uninterpreted_option: [], + __pb_extensions__: %{}, + __unknown_fields__: [] + }, + client_streaming: false, + server_streaming: false, __unknown_fields__: [] } ], - enum_type: [], - service: [ - %Google.Protobuf.ServiceDescriptorProto{ - name: "Greeter", - method: [ - %Google.Protobuf.MethodDescriptorProto{ - name: "SayHello", - input_type: ".helloworld.HelloRequest", - output_type: ".helloworld.HelloReply", - options: %Google.Protobuf.MethodOptions{ - deprecated: false, - idempotency_level: :IDEMPOTENCY_UNKNOWN, - uninterpreted_option: [], - __pb_extensions__: %{}, - __unknown_fields__: [] - }, - client_streaming: false, - server_streaming: false, - __unknown_fields__: [] - } - ], - options: nil, - __unknown_fields__: [] - } - ], - extension: [], - options: %Google.Protobuf.FileOptions{ - java_package: "io.grpc.examples.helloworld", - java_outer_classname: "HelloWorldProto", - optimize_for: :SPEED, - java_multiple_files: true, - go_package: nil, - cc_generic_services: false, - java_generic_services: false, - py_generic_services: false, - java_generate_equals_and_hash: nil, - deprecated: false, - java_string_check_utf8: false, - cc_enable_arenas: true, - objc_class_prefix: "HLW", - csharp_namespace: nil, - swift_prefix: nil, - php_class_prefix: nil, - php_namespace: nil, - php_generic_services: false, - php_metadata_namespace: nil, - ruby_package: nil, - uninterpreted_option: [], - __pb_extensions__: %{}, - __unknown_fields__: [] - }, - source_code_info: %Google.Protobuf.SourceCodeInfo{ - location: [ - %Google.Protobuf.SourceCodeInfo.Location{ - path: [], - span: [0, 0, 26, 1], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: ~c"\f", - span: [0, 0, 18], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: ~c"\b", - span: [2, 0, 34], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: ~c"\b\n", - span: [2, 0, 34], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: ~c"\b", - span: [3, 0, 52], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [8, 1], - span: [3, 0, 52], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: ~c"\b", - span: [4, 0, 48], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: ~c"\b\b", - span: [4, 0, 48], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: ~c"\b", - span: [5, 0, 33], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: ~c"\b$", - span: [5, 0, 33], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [3, 0], - span: [7, 0, 41], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [2], - span: [9, 0, 19], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [6, 0], - span: [12, 0, 15, 1], - leading_comments: " The greeting service definition.\n", - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [6, 0, 1], - span: [12, 8, 15], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [6, 0, 2, 0], - span: [14, 2, 53], - leading_comments: " Sends a greeting\n", - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [6, 0, 2, 0, 1], - span: [14, 6, 14], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [6, 0, 2, 0, 2], - span: [14, 16, 28], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [6, 0, 2, 0, 3], - span: [14, 39, 49], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [4, 0], - span: [18, 0, 20, 1], - leading_comments: " The request message containing the user's name.\n", - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [4, 0, 1], - span: [18, 8, 20], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [4, 0, 2, 0], - span: [19, 2, 18], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [4, 0, 2, 0, 5], - span: [19, 2, 8], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [4, 0, 2, 0, 1], - span: [19, 9, 13], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [4, 0, 2, 0, 3], - span: [19, 16, 17], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [4, 1], - span: [23, 0, 26, 1], - leading_comments: " The response message containing the greetings\n", - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [4, 1, 1], - span: [23, 8, 18], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [4, 1, 2, 0], - span: [24, 2, 21], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [4, 1, 2, 0, 5], - span: [24, 2, 8], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [4, 1, 2, 0, 1], - span: [24, 9, 16], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [4, 1, 2, 0, 3], - span: [24, 19, 20], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [4, 1, 2, 1], - span: [25, 2, 38], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [4, 1, 2, 1, 6], - span: [25, 2, 27], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [4, 1, 2, 1, 1], - span: [25, 28, 33], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - }, - %Google.Protobuf.SourceCodeInfo.Location{ - path: [4, 1, 2, 1, 3], - span: [25, 36, 37], - leading_comments: nil, - trailing_comments: nil, - leading_detached_comments: [], - __unknown_fields__: [] - } - ], - __unknown_fields__: [] - }, - public_dependency: [], - weak_dependency: [], - syntax: "proto3", - edition: nil, + options: nil, __unknown_fields__: [] } end @@ -513,4 +136,4 @@ end defmodule Helloworld.Greeter.Stub do use GRPC.Stub, service: Helloworld.Greeter.Service -end \ No newline at end of file +end From 3c8f9b5c7e8b349750f42d600502341de4984249 Mon Sep 17 00:00:00 2001 From: Ianko Leite Date: Tue, 21 Jan 2025 18:04:41 -0500 Subject: [PATCH 5/7] match grpc versions --- .tool-versions | 4 ++-- examples/helloworld/.tool-versions | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.tool-versions b/.tool-versions index 852c6c1..584f3bc 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -elixir 1.15.7-otp-25 -erlang 25.1.1 +elixir 1.15.7-otp-26 +erlang 26.1.2 \ No newline at end of file diff --git a/examples/helloworld/.tool-versions b/examples/helloworld/.tool-versions index 852c6c1..584f3bc 100644 --- a/examples/helloworld/.tool-versions +++ b/examples/helloworld/.tool-versions @@ -1,2 +1,2 @@ -elixir 1.15.7-otp-25 -erlang 25.1.1 +elixir 1.15.7-otp-26 +erlang 26.1.2 \ No newline at end of file From edd1f3b3f84ec79c9d266a78fc5b7a2d880704de Mon Sep 17 00:00:00 2001 From: Ianko Leite Date: Tue, 21 Jan 2025 18:31:04 -0500 Subject: [PATCH 6/7] TEMP: use un-versioned fix --- examples/helloworld/mix.exs | 2 +- examples/helloworld/mix.lock | 2 +- mix.exs | 5 ++++- mix.lock | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/examples/helloworld/mix.exs b/examples/helloworld/mix.exs index 7e820a2..4b56d83 100644 --- a/examples/helloworld/mix.exs +++ b/examples/helloworld/mix.exs @@ -20,7 +20,7 @@ defmodule Helloworld.Mixfile do [ {:grpc, "~> 0.9"}, {:grpc_reflection, path: "../.."}, - {:protobuf, "~> 0.14"}, + {:protobuf, github: "elixir-protobuf/protobuf", ref: "cbb4c919b925f509696c6e58ca2e181b767f7f1f", override: true}, {:dialyxir, "~> 1.1", only: [:dev, :test], runtime: false} ] end diff --git a/examples/helloworld/mix.lock b/examples/helloworld/mix.lock index f59d996..0e5b4d8 100644 --- a/examples/helloworld/mix.lock +++ b/examples/helloworld/mix.lock @@ -7,7 +7,7 @@ "gun": {:hex, :gun, "2.1.0", "b4e4cbbf3026d21981c447e9e7ca856766046eff693720ba43114d7f5de36e87", [:make, :rebar3], [{:cowlib, "2.13.0", [hex: :cowlib, repo: "hexpm", optional: false]}], "hexpm", "52fc7fc246bfc3b00e01aea1c2854c70a366348574ab50c57dfe796d24a0101d"}, "hpax": {:hex, :hpax, "1.0.2", "762df951b0c399ff67cc57c3995ec3cf46d696e41f0bba17da0518d94acd4aac", [:mix], [], "hexpm", "2f09b4c1074e0abd846747329eaa26d535be0eb3d189fa69d812bfb8bfefd32f"}, "mint": {:hex, :mint, "1.6.2", "af6d97a4051eee4f05b5500671d47c3a67dac7386045d87a904126fd4bbcea2e", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1 or ~> 0.2.0 or ~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "5ee441dffc1892f1ae59127f74afe8fd82fda6587794278d924e4d90ea3d63f9"}, - "protobuf": {:hex, :protobuf, "0.14.0", "75b64b8c1f0c833b5e76cd841d3448f077f655c2a2eed53358651fbfe4a6b70e", [:mix], [{:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0f747eaa54ace9617536f1cb4b2a4962bc7e43f1aa475c6fa9c60079955c4cb0"}, + "protobuf": {:git, "https://github.com/elixir-protobuf/protobuf.git", "cbb4c919b925f509696c6e58ca2e181b767f7f1f", [ref: "cbb4c919b925f509696c6e58ca2e181b767f7f1f"]}, "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"}, "telemetry": {:hex, :telemetry, "1.3.0", "fedebbae410d715cf8e7062c96a1ef32ec22e764197f70cda73d82778d61e7a2", [:rebar3], [], "hexpm", "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"}, } diff --git a/mix.exs b/mix.exs index 4654de9..54716fa 100644 --- a/mix.exs +++ b/mix.exs @@ -45,7 +45,10 @@ defmodule GrpcReflection.MixProject do {:dialyxir, "~> 1.4", only: [:dev, :test], runtime: false}, {:ex_doc, ">= 0.0.0", only: :dev, runtime: false}, {:grpc, "~> 0.9"}, - {:protobuf, "~> 0.14"} + {:protobuf, + github: "elixir-protobuf/protobuf", + ref: "cbb4c919b925f509696c6e58ca2e181b767f7f1f", + override: true} ] end diff --git a/mix.lock b/mix.lock index e4be6bf..47bd1ce 100644 --- a/mix.lock +++ b/mix.lock @@ -17,7 +17,7 @@ "makeup_erlang": {:hex, :makeup_erlang, "1.0.1", "c7f58c120b2b5aa5fd80d540a89fdf866ed42f1f3994e4fe189abebeab610839", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "8a89a1eeccc2d798d6ea15496a6e4870b75e014d1af514b1b71fa33134f57814"}, "mint": {:hex, :mint, "1.6.2", "af6d97a4051eee4f05b5500671d47c3a67dac7386045d87a904126fd4bbcea2e", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1 or ~> 0.2.0 or ~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "5ee441dffc1892f1ae59127f74afe8fd82fda6587794278d924e4d90ea3d63f9"}, "nimble_parsec": {:hex, :nimble_parsec, "1.4.1", "f41275a0354c736db4b1d255b5d2a27c91028e55c21ea3145b938e22649ffa3f", [:mix], [], "hexpm", "605e44204998f138d6e13be366c8e81af860e726c8177caf50067e1b618fe522"}, - "protobuf": {:hex, :protobuf, "0.14.0", "75b64b8c1f0c833b5e76cd841d3448f077f655c2a2eed53358651fbfe4a6b70e", [:mix], [{:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "0f747eaa54ace9617536f1cb4b2a4962bc7e43f1aa475c6fa9c60079955c4cb0"}, + "protobuf": {:git, "https://github.com/elixir-protobuf/protobuf.git", "cbb4c919b925f509696c6e58ca2e181b767f7f1f", [ref: "cbb4c919b925f509696c6e58ca2e181b767f7f1f"]}, "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"}, "telemetry": {:hex, :telemetry, "1.3.0", "fedebbae410d715cf8e7062c96a1ef32ec22e764197f70cda73d82778d61e7a2", [:rebar3], [], "hexpm", "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"}, } From 017b514d22620162dc8cbd63e27a9968a3956256 Mon Sep 17 00:00:00 2001 From: Ianko Leite Date: Tue, 21 Jan 2025 18:48:05 -0500 Subject: [PATCH 7/7] add trailing line --- examples/helloworld/generate_protos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/helloworld/generate_protos.sh b/examples/helloworld/generate_protos.sh index 2c11ece..0180715 100755 --- a/examples/helloworld/generate_protos.sh +++ b/examples/helloworld/generate_protos.sh @@ -4,4 +4,4 @@ protoc -I priv/protos \ --elixir_out=plugins=grpc:./lib/protos \ --elixir_opt=include_docs=true \ --elixir_out=plugins=grpc,gen_descriptors=true:lib/protos \ - priv/protos/*.proto \ No newline at end of file + priv/protos/*.proto