Skip to content

Commit c54516d

Browse files
vsbogdvsbogd
authored
Merge pull request #59 from vsbogd/upgrade-grpc-version
Upgrade grpc version to 1.28.0
2 parents ba08a3e + a049e02 commit c54516d

12 files changed

Lines changed: 40 additions & 18 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![CircleCI](https://circleci.com/gh/singnet/snet-sdk-java.svg?style=svg)](https://circleci.com/gh/singnet/snet-sdk-java)
44
[![codecov](https://codecov.io/gh/singnet/snet-sdk-java/branch/master/graph/badge.svg)](https://codecov.io/gh/singnet/snet-sdk-java)
55
[![Release](https://jitpack.io/v/singnet/snet-sdk-java.svg)](https://jitpack.io/#singnet/snet-sdk-java)
6-
[![Javadoc](https://img.shields.io/badge/javadoc-master--SNAPSHOT-brightgreen)](https://jitpack.io/com/github/singnet/snet-sdk-java/snet-sdk-java/master-SNAPSHOT/javadoc)
6+
[![Javadoc](https://img.shields.io/badge/javadoc-0.3.2-brightgreen)](https://jitpack.io/com/github/singnet/snet-sdk-java/snet-sdk-java/0.3.2/javadoc)
77

88
## Implementing SingularityNet service client in Java
99

@@ -29,7 +29,7 @@
2929
```xml
3030
<project>
3131
<properties>
32-
<snet.sdk.java.version>master-SNAPSHOT</snet.sdk.java.version>
32+
<snet.sdk.java.version>0.3.2</snet.sdk.java.version>
3333
</properties>
3434

3535
<build>

‎example/android/SNetDemo/gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ android.useAndroidX=true
1919
android.enableJetifier=true
2020

2121
# SingularityNet Java SDK dependency versions
22-
snetSdkJavaVersion=master-SNAPSHOT
23-
grpcVersion=1.20.0
22+
snetSdkJavaVersion=0.3.2
23+
grpcVersion=1.28.0
2424
protobufVersion=3.5.1

‎example/cli/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
<maven.compiler.source>1.8</maven.compiler.source>
1515
<maven.compiler.target>1.8</maven.compiler.target>
16-
<snet.sdk.java.version>master-SNAPSHOT</snet.sdk.java.version>
16+
<snet.sdk.java.version>0.3.2</snet.sdk.java.version>
1717
<protobuf.version>3.5.1</protobuf.version>
18-
<grpc.version>1.20.0</grpc.version>
18+
<grpc.version>1.28.0</grpc.version>
1919
<slf4j.version>1.7.29</slf4j.version>
2020
</properties>
2121

‎example/tutorial/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<maven.compiler.source>1.8</maven.compiler.source>
1717
<maven.compiler.target>1.8</maven.compiler.target>
18-
<snet.sdk.java.version>master-SNAPSHOT</snet.sdk.java.version>
18+
<snet.sdk.java.version>0.3.2</snet.sdk.java.version>
1919
</properties>
2020

2121
<repositories>
@@ -92,7 +92,7 @@
9292
<configuration>
9393
<protocArtifact>com.google.protobuf:protoc:3.5.1:exe:${os.detected.classifier}</protocArtifact>
9494
<pluginId>grpc-java</pluginId>
95-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.20.0:exe:${os.detected.classifier}</pluginArtifact>
95+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.28.0:exe:${os.detected.classifier}</pluginArtifact>
9696
<checkStaleness>true</checkStaleness>
9797
<protoSourceRoot>${project.build.directory}/proto</protoSourceRoot>
9898
</configuration>

‎plugin/core/pom.xml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.singnet.snet-sdk-java</groupId>
88
<artifactId>snet-sdk-plugin-pom</artifactId>
9-
<version>master-SNAPSHOT</version>
9+
<version>0.3.2</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>
@@ -23,6 +23,28 @@
2323
<dependency>
2424
<groupId>com.github.singnet.snet-sdk-java</groupId>
2525
<artifactId>snet-sdk-java</artifactId>
26+
<exclusions>
27+
<!-- TODO:
28+
grpc-protobuf artifact depends on guava:28-android.
29+
Android guava version doesn't inherit NonSerializableMemoizingSupplier
30+
from java.util.function.Supplier which lead to error while using
31+
gradle plugin to build Android app:
32+
> Failed to apply plugin [id 'com.android.internal.application']
33+
> com.google.common.base.Suppliers$NonSerializableMemoizingSupplier cannot be cast to java.util.function.Supplier
34+
the workaround below replaces guava Android version by JRE version
35+
for plugins. It should be removed if guava is fixed.
36+
-->
37+
<exclusion>
38+
<groupId>com.google.guava</groupId>
39+
<artifactId>guava</artifactId>
40+
</exclusion>
41+
</exclusions>
42+
</dependency>
43+
<dependency>
44+
<groupId>com.google.guava</groupId>
45+
<artifactId>guava</artifactId>
46+
<!-- version 28.1 corresponds to the grpc version 1.28.0 -->
47+
<version>28.1-jre</version>
2648
</dependency>
2749
<dependency>
2850
<groupId>org.apache.commons</groupId>

‎plugin/gradle/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Sdk supports Android platfrom version 7.0 or higher (API level 24 or higher).
66

77
It is convenient to add dependencies version into `gradle.properties` file:
88
```
9-
snetSdkJavaVersion=master-SNAPSHOT
10-
grpcVersion=1.20.0
9+
snetSdkJavaVersion=0.3.2
10+
grpcVersion=1.28.0
1111
protobufVersion=3.5.1
1212
```
1313

‎plugin/gradle/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.singnet.snet-sdk-java</groupId>
88
<artifactId>snet-sdk-plugin-pom</artifactId>
9-
<version>master-SNAPSHOT</version>
9+
<version>0.3.2</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

‎plugin/maven/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.github.singnet.snet-sdk-java</groupId>
66
<artifactId>snet-sdk-plugin-pom</artifactId>
7-
<version>master-SNAPSHOT</version>
7+
<version>0.3.2</version>
88
</parent>
99

1010
<modelVersion>4.0.0</modelVersion>

‎plugin/maven/src/test/resources/project-to-test/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<name>Test MyMojo</name>
1212

1313
<properties>
14-
<snet.sdk.java.version>master-SNAPSHOT</snet.sdk.java.version>
14+
<snet.sdk.java.version>0.3.2</snet.sdk.java.version>
1515
</properties>
1616

1717
<build>

‎plugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.github.singnet.snet-sdk-java</groupId>
88
<artifactId>snet-sdk-java-pom</artifactId>
9-
<version>master-SNAPSHOT</version>
9+
<version>0.3.2</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>

0 commit comments

Comments
 (0)