update sdk to latest version

Signed-off-by: Denys Smirnov <[email protected]>

Author: Denys Smirnov

.travis.yml

@@ -6,18 +6,21 @@ go:
 services:
   - docker
 
+env:
+  - BBLFSHD_VERSION=v2.6.1
+
 before_script:
   - curl -L https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 > $GOPATH/bin/dep
   - chmod +x $GOPATH/bin/dep
   - dep ensure --vendor-only
   - go get ./vendor/gopkg.in/bblfsh/sdk.v2/cmd/...
   - go install ./vendor/gopkg.in/bblfsh/sdk.v2/cmd/...
-  - docker pull bblfsh/bblfshd
+  - docker pull bblfsh/bblfshd:$BBLFSHD_VERSION
 
 script:
   - bblfsh-sdk update --dry-run
   - bblfsh-sdk build ci-build
-  - bblfsh-sdk test ci-build
+  - bblfsh-sdk test --bblfshd $BBLFSHD_VERSION ci-build
 
 after_success:
   - bblfsh-sdk push ci-build

Dockerfile

@@ -57,7 +57,7 @@ LABEL maintainer="source{d}" \
 WORKDIR /opt/driver
 
 # copy static files from driver source directory
-ADD ./native/src/main/sh/native.sh ./bin/native
+ADD ./native/native.sh ./bin/native
 
 
 # copy build artifacts for native driver

Dockerfile.build.tpl

@@ -2,8 +2,8 @@
 # for detailed Gopkg.toml documentation.
 
 [[constraint]]
-  branch = "v2"
   name = "gopkg.in/bblfsh/sdk.v2"
+  version = "v2.1.x"
 
 [prune]
   go-tests = true

Dockerfile.tpl

@@ -1,4 +1,4 @@
-# java-driver  ![Driver Status](https://img.shields.io/badge/status-beta-dbd25c.svg) [![Build Status](https://travis-ci.org/bblfsh/java-driver.svg?branch=master)](https://travis-ci.org/bblfsh/java-driver) ![Native Version](https://img.shields.io/badge/java%20version-8.171.11--r0-aa93ea.svg) ![Go Version](https://img.shields.io/badge/go%20version-1.9-63afbf.svg)
+# Java driver for [Babelfish](https://github.com/bblfsh/bblfshd) ![Driver Status](https://img.shields.io/badge/status-beta-dbd25c.svg) [![Build Status](https://travis-ci.org/bblfsh/java-driver.svg?branch=master)](https://travis-ci.org/bblfsh/java-driver) ![Native Version](https://img.shields.io/badge/java%20version-8.171.11--r0-aa93ea.svg) ![Go Version](https://img.shields.io/badge/go%20version-1.9-63afbf.svg)
 
 
 
@@ -8,14 +8,14 @@ Development Environment
 Requirements:
 - `docker`
 - [`bblfsh-sdk`](https://github.com/bblfsh/sdk) _(go get -u gopkg.in/bblfsh/sdk.v2/...)_
-- UAST converter dependencies _(go get -t -v ./...)_
+- UAST converter dependencies _(dep ensure --vendor-only)_
 
-To initialize the build system execute: `bblfsh-sdk prepare-build`, at the root of the project. This will install the SDK at `.sdk` for this driver.
+To initialize the build system execute: `bblfsh-sdk update`, at the root of the project. This will generate the `Dockerfile` for this driver.
 
-To execute the tests just execute `make test`, this will execute the test over the native and the go components of the driver. Use `make test-native` to run the test only over the native component or `make test-driver` to run the test just over the go component.
+To execute the tests just execute `bblfsh-sdk test`, this will execute the test over the native and the go components of the driver using Docker.
 
-The build is done executing `make build`. To evaluate the result using a docker container, execute:
-`docker run -it bblfsh/java-driver:dev-<commit[:7]>-dirty`
+The build is done executing `bblfsh-sdk build`. To evaluate the result using a docker container, execute:
+`bblfsh-sdk build test-driver && docker run -it test-driver`.
 
 
 License

Gopkg.lock

@@ -5,7 +5,7 @@ go-runtime:
 native:
   image: 'openjdk:8-jre-alpine'
   static:
-    - path: 'src/main/sh/native.sh'
+    - path: 'native.sh'
       dest: 'native'
   build:
     image: 'openjdk:8-slim'

Gopkg.toml

@@ -28,7 +28,9 @@ CompilationUnit {
 .  .  .  .  internalRole: types
 .  .  .  }
 .  .  .  Children: {
-.  .  .  .  0: Identifier {
+.  .  .  .  0: SimpleName {
+.  .  .  .  .  Roles: Expression,Identifier
+.  .  .  .  .  TOKEN "Testcls1"
 .  .  .  .  .  StartPosition: {
 .  .  .  .  .  .  Offset: 6
 .  .  .  .  .  .  Line: 1
@@ -40,7 +42,6 @@ CompilationUnit {
 .  .  .  .  .  .  Col: 15
 .  .  .  .  .  }
 .  .  .  .  .  Properties: {
-.  .  .  .  .  .  Name: Testcls1
 .  .  .  .  .  .  internalRole: name
 .  .  .  .  .  }
 .  .  .  .  }