diff --git a/.pubnub.yml b/.pubnub.yml index 80004005c..2712578c6 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -1,8 +1,20 @@ name: java -version: 4.2.0 +version: 4.2.2 schema: 1 scm: github.com/pubnub/java changelog: + - version: v4.2.2 + date: + changes: + - type: improvement + text: remove final identifiers from the public facing API. + - version: v4.2.1 + date: + changes: + - type: improvement + text: include publisher UUID on incoming message + - type: improvement + text: allow to set custom TTL on a publish - version: v4.2.0 date: changes: diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cf474706..366436565 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,28 @@ +## [v4.2.2](https://github.com/pubnub/java/tree/v4.2.2) + + + [Full Changelog](https://github.com/pubnub/java/compare/v4.2.1...v4.2.2) + + +- ⭐remove final identifiers from the public facing API. + + + +## [v4.2.1](https://github.com/pubnub/java/tree/v4.2.1) + + + [Full Changelog](https://github.com/pubnub/java/compare/v4.2.0...v4.2.1) + + +- ⭐include publisher UUID on incoming message + + + +- ⭐allow to set custom TTL on a publish + + + ## [v4.2.0](https://github.com/pubnub/java/tree/v4.2.0) diff --git a/build.gradle b/build.gradle index 365d72b8e..f3123ac8f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id "io.franzbecker.gradle-lombok" version "1.7" - id 'com.github.johnrengelman.shadow' version '1.2.3' + id "io.franzbecker.gradle-lombok" version "1.8" + id 'com.github.johnrengelman.shadow' version '1.2.4' id "com.bmuschko.nexus" version "2.3.1" id 'com.github.ben-manes.versions' version '0.13.0' id 'java' @@ -10,7 +10,7 @@ plugins { id 'findbugs' } group = 'com.pubnub' -version = '4.2.1' +version = '4.2.2' description = """""" @@ -20,12 +20,18 @@ targetCompatibility = 1.7 configurations.all { } +lombok { + version = "1.16.12" +} + repositories { mavenCentral() } dependencies { compile group: 'com.squareup.retrofit2', name: 'retrofit', version:'2.1.0' + + // jackson compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version:'2.7.3' compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version:'2.7.3' compile group: 'com.squareup.retrofit2', name: 'converter-jackson', version:'2.1.0' @@ -82,15 +88,10 @@ processResources { expand projectVersion: project.version } - -javadoc { - destinationDir = file("docs") -} - extraArchive { - sources = true + sources = false tests = true - javadoc = false // enable when uploading to nexus : ). + javadoc = true } nexus { @@ -129,3 +130,31 @@ modifyPom { } } } + +import io.franzbecker.gradle.lombok.task.DelombokTask + +task delombok(type: DelombokTask, dependsOn: compileJava) { + ext.outputDir = file("$buildDir/delombok") + outputs.dir(outputDir) + sourceSets.main.java.srcDirs.each { + inputs.dir(it) + args(it, "-d", outputDir) + } +} + +task delombokHelp(type: DelombokTask) { + args "--help" +} + +javadoc { + dependsOn delombok + source = delombok.outputDir + destinationDir = file("docs") +} + +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = 'sources' + from "$buildDir/delombok"; +} + +build.finalizedBy(shadowJar) diff --git a/docs/allclasses-frame.html b/docs/allclasses-frame.html index be4829e6c..d117b9003 100644 --- a/docs/allclasses-frame.html +++ b/docs/allclasses-frame.html @@ -2,89 +2,117 @@ - -All Classes (pubnub 4.2.0 API) - + +All Classes (pubnub 4.2.2 API) + - -

All Classes

+

All Classes

+ + +
+ + + + + +
+ + + + diff --git a/docs/com/pubnub/api/endpoints/History.html b/docs/com/pubnub/api/endpoints/History.html index 287a57a17..d07fb010b 100644 --- a/docs/com/pubnub/api/endpoints/History.html +++ b/docs/com/pubnub/api/endpoints/History.html @@ -2,38 +2,25 @@ - -History (pubnub 4.2.0 API) - + +History (pubnub 4.2.2 API) + - -
+
- - - +