Skip to content

Commit a5977a4

Browse files
committed
Merge branch 'dev'
2 parents a28b39d + 5ae64e6 commit a5977a4

File tree

4 files changed

+17
-10
lines changed

4 files changed

+17
-10
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ project build.gradle
2424
```groovy
2525
2626
ext {
27-
minterBlockchainSDK = "0.5.1"
27+
minterBlockchainSDK = "0.5.2"
2828
}
2929
3030
dependencies {

RELEASE.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Release notes
22

3+
## 0.5.2
4+
- Added `getApiService()` to modify api client
5+
36
## 0.5.1
47
- Added gas price methods, see BlockChainBlockRepository
58
- Opened gas price field and setter for transaction, it uses in new api

build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ buildscript {
3131
mavenLocal()
3232
}
3333
dependencies {
34-
classpath 'com.android.tools.build:gradle:3.2.1'
34+
classpath 'com.android.tools.build:gradle:3.3.1'
3535
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
3636
}
3737
}
@@ -58,14 +58,14 @@ apply plugin: 'com.jfrog.bintray'
5858

5959

6060
group = 'network.minter.android'
61-
version = '0.5.1'
61+
version = '0.5.2'
6262

6363
ext {
6464
minterMinSdk = 16
6565
minterMaxSdk = 28
6666
minterBuildTools = "28.0.3"
6767
minterLibSupport = "28.0.0"
68-
minterCoreVers = "0.2.2"
68+
minterCoreVers = "0.2.3"
6969

7070

7171
buildArtifactName = project.name
@@ -186,13 +186,13 @@ dependencies {
186186
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
187187

188188
// network
189-
implementation 'com.squareup.okhttp3:okhttp:3.11.0'
189+
implementation 'com.squareup.okhttp3:okhttp:3.12.1'
190190
implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
191-
implementation 'com.squareup.retrofit2:retrofit:2.4.0'
192-
implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
191+
implementation 'com.squareup.retrofit2:retrofit:2.5.0'
192+
implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
193193

194-
implementation 'org.parceler:parceler-api:1.1.11'
195-
annotationProcessor 'org.parceler:parceler:1.1.11'
194+
implementation 'org.parceler:parceler-api:1.1.12'
195+
annotationProcessor 'org.parceler:parceler:1.1.12'
196196

197197
// stuff
198198
implementation 'com.jakewharton.timber:timber:4.7.1'
@@ -203,7 +203,7 @@ dependencies {
203203
androidTestImplementation "com.android.support:support-annotations:${minterLibSupport}"
204204
androidTestImplementation 'com.android.support.test:runner:1.0.2'
205205
androidTestImplementation 'com.android.support.test:rules:1.0.2'
206-
androidTestImplementation 'com.squareup.retrofit2:converter-gson:2.4.0'
206+
androidTestImplementation 'com.squareup.retrofit2:converter-gson:2.5.0'
207207
androidTestImplementation 'com.google.code.gson:gson:2.8.5'
208208
}
209209

src/main/java/network/minter/blockchain/MinterBlockChainApi.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,10 @@ public static MinterBlockChainApi getInstance() {
131131
return INSTANCE;
132132
}
133133

134+
public ApiService.Builder getApiService() {
135+
return mApiService;
136+
}
137+
134138
public GsonBuilder getGsonBuilder() {
135139
GsonBuilder out = new GsonBuilder();
136140
out.registerTypeAdapter(MinterAddress.class, new MinterAddressDeserializer());

0 commit comments

Comments
 (0)