Skip to content

Commit

Permalink
Dependencies version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
kleewho authored Jul 21, 2022
1 parent 988deea commit 41591f6
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 20 deletions.
19 changes: 13 additions & 6 deletions .pubnub.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: java
version: 6.0.2
version: 6.1.0
schema: 1
scm: github.com/pubnub/java
files:
- build/libs/pubnub-gson-6.0.2-all.jar
- build/libs/pubnub-gson-6.1.0-all.jar
sdks:
-
type: library
Expand All @@ -23,8 +23,8 @@ sdks:
-
distribution-type: library
distribution-repository: GitHub
package-name: pubnub-gson-6.0.2
location: https://github.com/pubnub/java/releases/download/v6.0.2/pubnub-gson-6.0.2-all.jar
package-name: pubnub-gson-6.1.0
location: https://github.com/pubnub/java/releases/download/v6.1.0/pubnub-gson-6.1.0-all.jar
supported-platforms:
supported-operating-systems:
Android:
Expand Down Expand Up @@ -135,8 +135,8 @@ sdks:
-
distribution-type: library
distribution-repository: maven
package-name: pubnub-gson-6.0.2
location: https://repo.maven.apache.org/maven2/com/pubnub/pubnub-gson/6.0.2/pubnub-gson-6.0.2.jar
package-name: pubnub-gson-6.1.0
location: https://repo.maven.apache.org/maven2/com/pubnub/pubnub-gson/6.1.0/pubnub-gson-6.1.0.jar
supported-platforms:
supported-operating-systems:
Android:
Expand Down Expand Up @@ -234,6 +234,13 @@ sdks:
is-required: Required

changelog:
- date: 2022-07-21
version: v6.1.0
changes:
- type: feature
text: "Add support for spaces and users permissions in grantToken."
- type: feature
text: "Add userId to PNConfiguration and deprecate uuid ."
- date: 2022-05-19
version: v6.0.2
changes:
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## v6.1.0
July 21 2022

#### Added
- Add support for spaces and users permissions in grantToken.
- Add userId to PNConfiguration and deprecate uuid .

## v6.0.2
May 19 2022

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ You will need the publish and subscribe keys to authenticate your app. Get your
<dependency>
<groupId>com.pubnub</groupId>
<artifactId>pubnub-gson</artifactId>
<version>6.0.2</version>
<version>6.1.0</version>
</dependency>
```

* for Gradle, add the following dependency in your `gradle.build`:
```groovy
implementation 'com.pubnub:pubnub-gson:6.0.2'
implementation 'com.pubnub:pubnub-gson:6.1.0'
```

2. Configure your keys:
Expand Down
20 changes: 10 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ plugins {
}
group = 'com.pubnub'

version = '6.0.2'
version = '6.1.0'

description = """"""

Expand Down Expand Up @@ -57,27 +57,27 @@ dependencies {
implementation group: 'com.squareup.retrofit2', name: 'converter-gson', version: '2.6.2'

// cbor
implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.3'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.3'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.3'

implementation 'org.jetbrains:annotations:17.0.0'
implementation 'org.jetbrains:annotations:23.0.0'

testCompile group: 'org.mockito', name: 'mockito-core', version: '3.3.3'
testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
testImplementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.3'
testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.9'
testImplementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.9'
testImplementation group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3'
testImplementation group: 'junit', name: 'junit', version: '4.12'
testImplementation group: 'com.github.tomakehurst', name: 'wiremock', version: '2.25.0'
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
testImplementation group: 'com.github.tomakehurst', name: 'wiremock', version: '2.27.2'
testImplementation group: 'org.awaitility', name: 'awaitility', version: '4.0.1'
testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.6.0'
integrationTestImplementation group: 'org.aeonbits.owner', name: 'owner', version: '1.0.8'
implementation group: 'org.json', name: 'json', version: '20190722'
implementation group: 'org.json', name: 'json', version: '20200518'
testImplementation group: 'io.cucumber', name: 'cucumber-java', version: '6.10.4'
testImplementation group: 'io.cucumber', name: 'cucumber-junit', version: '6.10.4'
testImplementation group: 'io.cucumber', name: 'cucumber-picocontainer', version: '6.10.4'
testImplementation group: 'org.aeonbits.owner', name: 'owner', version: '1.0.8'
testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
}

task integrationTest(type: Test) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/pubnub/api/PubNub.java
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public class PubNub {
private static final int TIMESTAMP_DIVIDER = 1000;
private static final int MAX_SEQUENCE = 65535;

private static final String SDK_VERSION = "6.0.2";
private static final String SDK_VERSION = "6.1.0";
private final ListenerManager listenerManager;
private final StateManager stateManager;

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/pubnub/api/PubNubTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void getVersionAndTimeStamp() {
pubnub = new PubNub(pnConfiguration);
String version = pubnub.getVersion();
int timeStamp = pubnub.getTimestamp();
Assert.assertEquals("6.0.2", version);
Assert.assertEquals("6.1.0", version);
Assert.assertTrue(timeStamp > 0);
}

Expand Down

0 comments on commit 41591f6

Please sign in to comment.