Skip to content

Commit 52f3530

Browse files
authored
Feature/v1.6.0 (#14)
* Changes related to the version 1.6.0 * updated lib binaries * Circle ci config * multi-linux build * cleanup CI related stuff * Fixed bug in blocking iterator * Fixed bug in blocking queue * Version 1.6.3 * disabled timeouting tests
1 parent 4ce4532 commit 52f3530

24 files changed

+294
-81
lines changed

.circleci/config.yml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
version: 2.1
2+
3+
orbs:
4+
win: circleci/[email protected]
5+
# codecov: codecov/[email protected]
6+
7+
jobs:
8+
build-linux-common: &build-linux
9+
docker:
10+
- image: ""
11+
steps:
12+
- checkout
13+
- restore_cache:
14+
key: sbt-cache
15+
- run:
16+
name: Compile test coverage
17+
command: cat /dev/null | sbt clean coverage test coverageReport
18+
- run:
19+
name: Upload coverage
20+
command: cat /dev/null | bash <(curl -s https://codecov.io/bash)
21+
22+
- save_cache:
23+
key: sbt-cache
24+
paths:
25+
- "~/.ivy2/cache"
26+
- "~/.sbt"
27+
- "~/.m2"
28+
29+
build-linux-16:
30+
<<: *build-linux
31+
docker:
32+
- image: 'circleci/openjdk:16-jdk-buster'
33+
34+
build-linux-11:
35+
<<: *build-linux
36+
docker:
37+
- image: 'circleci/openjdk:11-jdk'
38+
39+
build-linux-8:
40+
<<: *build-linux
41+
docker:
42+
- image: 'circleci/openjdk:8-jdk'
43+
44+
build-windows:
45+
executor: win/default
46+
47+
steps:
48+
# INSTALL SBT IN WINDOWS
49+
- checkout
50+
- restore_cache:
51+
key: sbt-cache
52+
- run:
53+
name: Compile test coverage
54+
command: cat /dev/null | sbt clean coverage test coverageReport
55+
- codecov/upload:
56+
file: {{ coverage_report_filepath }}
57+
58+
- save_cache:
59+
key: sbt-cache
60+
paths:
61+
- "~/.ivy2/cache"
62+
- "~/.sbt"
63+
- "~/.m2"
64+
workflows:
65+
build:
66+
jobs:
67+
- build-linux-8
68+
- build-linux-11
69+
- build-linux-16
70+
71+
# - build-windows

.travis.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
11
# Release Notes
22
All notable changes to this project will be documented in this file.
33

4+
## 1.6.3 Feb 8, 2021
5+
6+
### Featured
7+
- Support for TON-Client (1.6.3 Feb 4, 2021)
8+
9+
10+
## 1.6.0 Feb 2, 2021
11+
12+
### Featured
13+
- Support for TON-Client (1.6.0 Jan 29, 2021)
14+
15+
416
## 1.5.2 Jan 14, 2021
517

618
### Featured
719
- Support for TON-Client (1.5.2 Dec 30, 2020)
820

21+
922
## 1.4.0 Jan 12, 2021
1023

1124
### Featured

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
TON SDK Client library Scala bindings.
66

7-
[![Build Status](https://travis-ci.com/slavaschmidt/ton-sdk-client-scala-binding.svg?branch=main&env=BADGE=osx)](https://travis-ci.com/slavaschmidt/ton-sdk-client-scala-binding)
7+
[![Build Status](https://circleci.com/gh/slavaschmidt/ton-sdk-client-scala-binding.svg?style=shield&branch=main)](https://circleci.com/gh/slavaschmidt/ton-sdk-client-scala-binding)
88
[![codecov](https://codecov.io/gh/slavaschmidt/ton-sdk-client-scala-binding/branch/main/graph/badge.svg?token=MRUA0KJ2BK)](https://codecov.io/gh/slavaschmidt/ton-sdk-client-scala-binding)
99
[![License](http://img.shields.io/:license-Apache%202-red.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt)
1010
[![Maven Central](https://img.shields.io/maven-central/v/com.dancingcode/freeton-sdk-client-scala-binding_2.12)](https://repo.maven.apache.org/maven2/com/dancingcode/freeton-sdk-client-scala-binding_2.12/1.0.0-M2/)
@@ -19,7 +19,7 @@ Instead, a thin C wrapper is implemented. The wrapper translates Java calls into
1919

2020
## Compatibility
2121

22-
The current version is compatible with Freeton client v1.5.2, JDK 1.8+ and Scala 2.12.
22+
The current version is compatible with Freeton client v1.6.3, JDK 1.8+ and Scala 2.12.
2323

2424
We use CI on Linux Focal Fossa and MacOs X hosts to run our tests.
2525

@@ -30,9 +30,10 @@ Following systems confirmed to be compatible:
3030
- MacOs X (Catalina 10.15)
3131
- OpenJDK 8
3232
- OpenJDK 11
33+
- OpenJDK 16
3334
- OracleJDK 1.8.0
3435

35-
We're currently working on adding Windows x86, Scala 2.13 and Freeton client v1.1.0 support.
36+
We're currently working on adding Scala 2.13 support.
3637

3738

3839
## Prerequisites
@@ -111,6 +112,7 @@ The users of the library can easy create their own configurations by overriding
111112
"network": {
112113
"server_address": "http://localhost",
113114
"network_retries_count": 5,
115+
"max_reconnect_timeout": 120,
114116
"message_retries_count": 5,
115117
"message_processing_timeout": 40000,
116118
"wait_for_timeout": 40000,

build.sbt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
name := "freeton-sdk-client-scala-binding"
22

3-
version := "1.5.2-M1"
3+
version := "1.6.3-M1"
44

55
organization := "com.dancingcode"
66

7-
scalaVersion := "2.12.12"
7+
8+
lazy val scala212 = "2.12.12"
9+
lazy val scala213 = "2.13.3"
10+
11+
scalaVersion := scala212
12+
13+
// lazy val crossScalaVersions = List(scala212, scala213)
814

915
libraryDependencies ++= Seq(
1016
"org.slf4j" % "slf4j-api" % "1.7.30",
1117
"ch.qos.logback" % "logback-classic" % "1.2.3" % Provided,
1218
"org.scalatest" %% "scalatest" % "3.2.2" % Test
1319
)
1420

15-
libraryDependencies ++= Seq("circe-core", "circe-generic", "circe-parser", "circe-literal").map("io.circe" %% _ % "0.13.0")
21+
libraryDependencies ++= Seq("circe-core", "circe-generic", "circe-parser", "circe-literal", "circe-generic-extras").map("io.circe" %% _ % "0.13.0")
1622

1723
scalacOptions in Compile ++= Seq(
1824
"-Xlog-reflective-calls",
@@ -45,3 +51,6 @@ envVars in Test := Map(
4551
"LD_LIBRARY_PATH" -> (resourceDirectory in Compile).value.getAbsolutePath,
4652
"PATH" -> (resourceDirectory in Compile).value.getAbsolutePath
4753
)
54+
55+
// To test against all versions: `> + test`
56+
// To cross-publish: `> ; + publishSigned; sonatypeBundleRelease`

src/main/resources/libton_client.dylib

100755100644
185 KB
Binary file not shown.

src/main/resources/libton_client.so

100755100644
300 KB
Binary file not shown.

src/main/resources/ton_client.dll

100755100644
407 KB
Binary file not shown.

src/main/scala/ton/sdk/client/binding/Api.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ object Api {
4141

4242
type DebotHandle = Int
4343

44-
4544
/**
4645
* @param code the client error code
4746
* @param message the error message

0 commit comments

Comments
 (0)