Skip to content

Commit 5ddcd6a

Browse files
author
Max Presman
committed
Merge branch 'develop'
2 parents 56c5462 + a7f9ad0 commit 5ddcd6a

File tree

237 files changed

+606
-522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+606
-522
lines changed

‎.pubnub.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ scm: github.com/pubnub/java
55
files:
66
- build/libs/pubnub-gson-4.6.5-all.jar
77
changelog:
8+
- version: v4.7.0
9+
date:
10+
changes:
11+
- type: feature
12+
text: Allow injection of httpLoggingInterceptor for extra logging monitoring..
813
- version: v4.6.5
914
date:
1015
changes:

‎build.gradle‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
plugins {
22
id "io.franzbecker.gradle-lombok" version "1.8"
3-
id 'com.github.johnrengelman.shadow' version '1.2.4'
3+
id 'com.github.johnrengelman.shadow' version '2.0.1'
44
id "com.bmuschko.nexus" version "2.3.1"
5-
id 'com.github.ben-manes.versions' version '0.14.0'
5+
id 'com.github.ben-manes.versions' version '0.15.0'
66
id 'java'
77
id 'jacoco'
88
id 'maven'
99
id 'checkstyle'
1010
id 'findbugs'
1111
}
1212
group = 'com.pubnub'
13-
version = '4.6.5'
13+
version = '4.7.0'
1414

1515
description = """"""
1616

@@ -21,7 +21,7 @@ configurations.all {
2121
}
2222

2323
lombok {
24-
version = "1.16.12"
24+
version = "1.16.18"
2525
}
2626

2727
repositories {
@@ -30,9 +30,9 @@ repositories {
3030

3131

3232
dependencies {
33-
compile group: 'com.squareup.retrofit2', name: 'retrofit', version:'2.2.0'
33+
compile group: 'com.squareup.retrofit2', name: 'retrofit', version:'2.3.0'
3434

35-
compile group: 'com.squareup.okhttp3', name: 'logging-interceptor', version:'3.6.0'
35+
compile group: 'com.squareup.okhttp3', name: 'logging-interceptor', version:'3.8.1'
3636
compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.22'
3737

3838
// jackson
@@ -41,8 +41,8 @@ dependencies {
4141
// compile group: 'com.squareup.retrofit2', name: 'converter-jackson', version:'2.1.0'
4242

4343
// gson
44-
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0'
45-
compile group: 'com.squareup.retrofit2', name: 'converter-gson', version:'2.2.0'
44+
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.1'
45+
compile group: 'com.squareup.retrofit2', name: 'converter-gson', version:'2.3.0'
4646
//
4747

4848
testCompile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.8'

‎docs/allclasses-frame.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- Generated by javadoc -->
6-
<title>All Classes (pubnub-gson 4.6.5 API)</title>
6+
<title>All Classes (pubnub-gson 4.7.0 API)</title>
77
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
88
<script type="text/javascript" src="script.js"></script>
99
</head>

‎docs/allclasses-noframe.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- Generated by javadoc -->
6-
<title>All Classes (pubnub-gson 4.6.5 API)</title>
6+
<title>All Classes (pubnub-gson 4.7.0 API)</title>
77
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
88
<script type="text/javascript" src="script.js"></script>
99
</head>

‎docs/com/pubnub/api/PNConfiguration.html‎

Lines changed: 84 additions & 56 deletions
Large diffs are not rendered by default.

‎docs/com/pubnub/api/PubNub.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<html lang="en">
44
<head>
55
<!-- Generated by javadoc -->
6-
<title>PubNub (pubnub-gson 4.6.5 API)</title>
6+
<title>PubNub (pubnub-gson 4.7.0 API)</title>
77
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
88
<script type="text/javascript" src="../../../script.js"></script>
99
</head>
1010
<body>
1111
<script type="text/javascript"><!--
1212
try {
1313
if (location.href.indexOf('is-external=true') == -1) {
14-
parent.document.title="PubNub (pubnub-gson 4.6.5 API)";
14+
parent.document.title="PubNub (pubnub-gson 4.7.0 API)";
1515
}
1616
}
1717
catch(err) {

‎docs/com/pubnub/api/PubNubError.PubNubErrorBuilder.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<html lang="en">
44
<head>
55
<!-- Generated by javadoc -->
6-
<title>PubNubError.PubNubErrorBuilder (pubnub-gson 4.6.5 API)</title>
6+
<title>PubNubError.PubNubErrorBuilder (pubnub-gson 4.7.0 API)</title>
77
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
88
<script type="text/javascript" src="../../../script.js"></script>
99
</head>
1010
<body>
1111
<script type="text/javascript"><!--
1212
try {
1313
if (location.href.indexOf('is-external=true') == -1) {
14-
parent.document.title="PubNubError.PubNubErrorBuilder (pubnub-gson 4.6.5 API)";
14+
parent.document.title="PubNubError.PubNubErrorBuilder (pubnub-gson 4.7.0 API)";
1515
}
1616
}
1717
catch(err) {

‎docs/com/pubnub/api/PubNubError.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<html lang="en">
44
<head>
55
<!-- Generated by javadoc -->
6-
<title>PubNubError (pubnub-gson 4.6.5 API)</title>
6+
<title>PubNubError (pubnub-gson 4.7.0 API)</title>
77
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
88
<script type="text/javascript" src="../../../script.js"></script>
99
</head>
1010
<body>
1111
<script type="text/javascript"><!--
1212
try {
1313
if (location.href.indexOf('is-external=true') == -1) {
14-
parent.document.title="PubNubError (pubnub-gson 4.6.5 API)";
14+
parent.document.title="PubNubError (pubnub-gson 4.7.0 API)";
1515
}
1616
}
1717
catch(err) {

‎docs/com/pubnub/api/PubNubException.PubNubExceptionBuilder.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<html lang="en">
44
<head>
55
<!-- Generated by javadoc -->
6-
<title>PubNubException.PubNubExceptionBuilder (pubnub-gson 4.6.5 API)</title>
6+
<title>PubNubException.PubNubExceptionBuilder (pubnub-gson 4.7.0 API)</title>
77
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
88
<script type="text/javascript" src="../../../script.js"></script>
99
</head>
1010
<body>
1111
<script type="text/javascript"><!--
1212
try {
1313
if (location.href.indexOf('is-external=true') == -1) {
14-
parent.document.title="PubNubException.PubNubExceptionBuilder (pubnub-gson 4.6.5 API)";
14+
parent.document.title="PubNubException.PubNubExceptionBuilder (pubnub-gson 4.7.0 API)";
1515
}
1616
}
1717
catch(err) {

‎docs/com/pubnub/api/PubNubException.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<html lang="en">
44
<head>
55
<!-- Generated by javadoc -->
6-
<title>PubNubException (pubnub-gson 4.6.5 API)</title>
6+
<title>PubNubException (pubnub-gson 4.7.0 API)</title>
77
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
88
<script type="text/javascript" src="../../../script.js"></script>
99
</head>
1010
<body>
1111
<script type="text/javascript"><!--
1212
try {
1313
if (location.href.indexOf('is-external=true') == -1) {
14-
parent.document.title="PubNubException (pubnub-gson 4.6.5 API)";
14+
parent.document.title="PubNubException (pubnub-gson 4.7.0 API)";
1515
}
1616
}
1717
catch(err) {

0 commit comments

Comments
 (0)