Skip to content
This repository was archived by the owner on May 27, 2022. It is now read-only.

Commit 599c5fe

Browse files
committed
Compatibility with Erlang 20
Updated the travis setup, and updated rebar3
1 parent 3ea9ad0 commit 599c5fe

File tree

4 files changed

+5
-37
lines changed

4 files changed

+5
-37
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
_build/
22
test/.rebar3/
3-
TEST-file_"antidote_crdt.app".xml
3+
TEST-*.xml
44
*.swp
55
src/*.swp
66
test/*.swp
7-
*.beam
7+
*.beam

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: erlang
22
otp_release:
33
- 18.3
44
- 19.1
5+
- 20.1
56
install:
67
- mkdir -p ~/.config/rebar3/
78
- echo "{plugins, [rebar3_proper]}." > ~/.config/rebar3/rebar.config

rebar3

-96.9 KB
Binary file not shown.

tools.mk

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,5 @@
1-
# -------------------------------------------------------------------
2-
#
3-
# Copyright (c) 2014 Basho Technologies, Inc.
4-
#
5-
# This file is provided to you under the Apache License,
6-
# Version 2.0 (the "License"); you may not use this file
7-
# except in compliance with the License. You may obtain
8-
# a copy of the License at
9-
#
10-
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
12-
# Unless required by applicable law or agreed to in writing,
13-
# software distributed under the License is distributed on an
14-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
# KIND, either express or implied. See the License for the
16-
# specific language governing permissions and limitations
17-
# under the License.
18-
#
19-
# -------------------------------------------------------------------
20-
21-
# -------------------------------------------------------------------
22-
# NOTE: This file is is from https://github.com/basho/tools.mk.
23-
# It should not be edited in a project. It should simply be updated
24-
# wholesale when a new version of tools.mk is released.
25-
# -------------------------------------------------------------------
26-
27-
REBAR = $(shell pwd)/rebar3
28-
REVISION ?= $(shell git rev-parse --short HEAD)
29-
PROJECT ?= $(shell basename `find src -name "*.app.src"` .app.src)
30-
DEP_DIR ?= "deps"
31-
EBIN_DIR ?= "ebin"
32-
33-
.PHONY: compile-no-deps test docs xref dialyzer-run dialyzer-quick dialyzer \
34-
cleanplt upload-docs
35-
1+
.PHONY: compile-no-deps test docs xref dialyzer \
2+
363
compile-no-deps:
374
${REBAR} compile skip_deps=true
385

0 commit comments

Comments
 (0)