Skip to content

Commit

Permalink
Move back to ahamez/protox
Browse files Browse the repository at this point in the history
  • Loading branch information
ahamez committed Jun 5, 2020
1 parent e8694aa commit cdb1619
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ before_script:
- wget https://github.com/protocolbuffers/protobuf/releases/download/v3.12.0/protoc-3.12.0-linux-x86_64.zip
- unzip -d protoc protoc-3.12.0-linux-x86_64.zip
- export PATH=$PWD/protoc/bin/:$PATH
- wget https://github.com/EasyMile/protox/releases/download/0.20.0/conformance-linux-x86_64.zip
- wget https://github.com/ahamez/protox/releases/download/0.20.0/conformance-linux-x86_64.zip
- unzip conformance-linux-x86_64.zip
env:
- MIX_ENV=test PROTOBUF_CONFORMANCE_RUNNER=./conformance/conformance-test-runner LD_LIBRARY_PATH=./conformance/.libs
Expand All @@ -27,7 +27,7 @@ after_script:
- MIX_ENV=docs mix inch.report
notifications:
email:
- alexandre.hamez+travis@easymile.com
- alexandre.hamez+travis@gmail.com
cache:
directories:
- priv/plts
9 changes: 8 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
* xxx
- Move back to ahamez/protox
- Bump to Elixir 1.6 as minimal supported version
- Add benchmarks
- Add conformance tests to CI
- Add dialyzer to CI

* 0.20.0
- Pass all tests of protobuf 3.12 conformance suite tests
- (proto2) Always serialize required fields
Expand All @@ -13,7 +20,7 @@
- Fix warning about duplicate keys (thanks to https://github.com/ananthakumaran)

* 0.19.0
- CamelCase for all generated modules (fixes https://github.com/EasyMile/protox/issues/3)
- CamelCase for all generated modules (fixes https://github.com/ahamez/protox/issues/3)

* 0.18.0
- Allow ability to construct file names at compile time (thanks to https://github.com/ananthakumaran)
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Protox

[![Build Status](https://travis-ci.org/EasyMile/protox.svg?branch=master)](https://travis-ci.org/EasyMile/protox) [![Coverage Status](https://coveralls.io/repos/github/EasyMile/protox/badge.svg?branch=master)](https://coveralls.io/github/EasyMile/protox?branch=master) [![Hex.pm Version](http://img.shields.io/hexpm/v/protox.svg)](https://hex.pm/packages/protox) [![Inline docs](http://inch-ci.org/github/EasyMile/protox.svg)](http://inch-ci.org/github/EasyMile/protox)
[![Build Status](https://travis-ci.org/ahamez/protox.svg?branch=master)](https://travis-ci.org/ahamez/protox) [![Coverage Status](https://coveralls.io/repos/github/ahamez/protox/badge.svg?branch=master)](https://coveralls.io/github/ahamez/protox?branch=master) [![Hex.pm Version](http://img.shields.io/hexpm/v/protox.svg)](https://hex.pm/packages/protox) [![Inline docs](https://inch-ci.org/github/ahamez/protox.svg)](https://inch-ci.org/github/ahamez/protox)


Protox is a native Elixir library to work with Google's Protocol Buffers (version 2 and 3).
Protox is a native Elixir library to work with Google's Protocol Buffers (aka protobuf), versions 2 and 3.

This library passes all the tests of the conformance checker provided by Google. See the Conformance section for more information.

Expand Down Expand Up @@ -124,7 +124,7 @@ iex> <<8, 3, 18, 4, 8, 1, 18, 0>> |> Fiz.Foo.decode()
b: %{1 => %Fiz.Baz{__uf__: []}}}}
```

The `__uf__` field is explained in the section [Unknown fields](https://github.com/EasyMile/protox#unknown-fields).
The `__uf__` field is explained in the section [Unknown fields](https://github.com/ahamez/protox#unknown-fields).


# Unknown Fields
Expand Down
8 changes: 4 additions & 4 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule Protox.Mixfile do
def project do
[
app: :protox,
version: "0.20.0",
version: "0.21.0",
elixir: "~> 1.6",
build_embedded: Mix.env() == :prod,
start_permanent: Mix.env() == :prod,
Expand All @@ -13,7 +13,7 @@ defmodule Protox.Mixfile do
elixirc_paths: elixirc_paths(Mix.env()),
escript: escript(),
name: "Protox",
source_url: "https://github.com/EasyMile/protox",
source_url: "https://github.com/ahamez/protox",
description: description(),
package: package(),
dialyzer: [plt_file: {:no_warn, "priv/plts/dialyzer.plt"}]
Expand Down Expand Up @@ -44,7 +44,7 @@ defmodule Protox.Mixfile do

defp description do
"""
A 100% conformant Elixir library for Protocol Buffers
A fast, easy to use and 100% conformant Elixir library for Google Protocol Buffers (aka protobuf)
"""
end

Expand All @@ -63,7 +63,7 @@ defmodule Protox.Mixfile do
files: ["lib", "mix.exs", "README*", "LICENSE"],
maintainers: ["Alexandre Hamez"],
licenses: ["MIT"],
links: %{"GitHub" => "https://github.com/EasyMile/protox"}
links: %{"GitHub" => "https://github.com/ahamez/protox"}
]
end
end

0 comments on commit cdb1619

Please sign in to comment.