Skip to content

Commit 8770b4e

Browse files
PubNub SDK v6.1.0 release.
1 parent 611fc2e commit 8770b4e

Some content is hidden

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

41 files changed

+1356
-71
lines changed

.pubnub.yml

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: kotlin
2-
version: 6.0.3
2+
version: 6.1.0
33
schema: 1
44
scm: github.com/pubnub/kotlin
55
files:
6-
- build/libs/pubnub-kotlin-6.0.3-all.jar
6+
- build/libs/pubnub-kotlin-6.1.0-all.jar
77
sdks:
88
-
99
type: library
@@ -233,6 +233,13 @@ sdks:
233233
license-url: https://github.com/stleary/JSON-java/blob/20210307/LICENSE
234234
is-required: Required
235235
changelog:
236+
-
237+
version: v6.1.0
238+
date: 2021-09-08
239+
changes:
240+
-
241+
type: feature
242+
text: "Method grantToken has beed added. It allows generation of signed token with permissions for channels and channel groups."
236243
-
237244
version: v6.0.3
238245
date: 2021-07-26

CHANGELOG.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
## [v6.0.3](https://github.com/pubnub/kotlin/releases/tag/v6.0.3)
2-
July 26 2021
1+
## [v6.1.0](https://github.com/pubnub/kotlin/releases/tag/v6.1.0)
2+
September 8 2021
33

4-
[Full Changelog](https://github.com/pubnub/kotlin/compare/v6.0.2...v6.0.3)
4+
[Full Changelog](https://github.com/pubnub/kotlin/compare/v6.0.3...v6.1.0)
55

6-
- Using random initialization vector according to 'useRandomInitializationVector' flag setting.
6+
- Method grantToken has beed added. It allows generation of signed token with permissions for channels and channel groups.
77

88

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ You will need the publish and subscribe keys to authenticate your app. Get your
2323
<dependency>
2424
<groupId>com.pubnub</groupId>
2525
<artifactId>pubnub-gson</artifactId>
26-
<version>6.0.3</version>
26+
<version>6.1.0</version>
2727
</dependency>
2828
```
2929

build.gradle

+27-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ plugins {
1313
}
1414

1515
group = 'com.pubnub'
16-
version = '6.0.3'
16+
version = '6.1.0'
1717

1818
repositories {
1919
mavenCentral()
@@ -42,8 +42,30 @@ configurations {
4242
testFixturesImplementation { extendsFrom allTest }
4343
integrationTestImplementation { extendsFrom allTest }
4444
testImplementation { extendsFrom allTest }
45+
cucumberRuntime { extendsFrom testImplementation }
4546
}
4647

48+
task cucumber() {
49+
dependsOn assemble, testClasses
50+
group = "verification"
51+
doLast {
52+
javaexec {
53+
def localProperties = new Properties()
54+
localProperties.load(new FileInputStream(rootProject.file("src/test/resources/config.properties")))
55+
56+
main = "io.cucumber.core.cli.Main"
57+
classpath = configurations.cucumberRuntime + sourceSets.main.output + sourceSets.test.output
58+
59+
if (localProperties['cucumber.tags'] != null) {
60+
args = ['--tags', localProperties['cucumber.tags'], '--plugin', 'pretty', '--glue', 'com.pubnub.contract', localProperties['features.dir']]
61+
} else {
62+
args = ['--plugin', 'pretty', '--glue', 'com.pubnub.contract', localProperties['features.dir']]
63+
}
64+
}
65+
}
66+
}
67+
68+
4769
dependencies {
4870
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
4971

@@ -54,6 +76,7 @@ dependencies {
5476
api 'com.google.code.gson:gson:2.8.6'
5577
implementation "com.squareup.retrofit2:converter-gson:2.9.0"
5678
implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.2'
79+
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.3'
5780
compile 'com.fasterxml.jackson.module:jackson-module-kotlin:2.12.2'
5881
implementation "org.slf4j:slf4j-api:1.7.30"
5982

@@ -69,6 +92,9 @@ dependencies {
6992
allTest "dev.nohus:AutoKonfig:1.0.0"
7093

7194
testImplementation "io.mockk:mockk:1.11.0"
95+
testImplementation group: 'io.cucumber', name: 'cucumber-java', version: '6.10.4'
96+
testImplementation group: 'io.cucumber', name: 'cucumber-junit', version: '6.10.4'
97+
testImplementation group: 'io.cucumber', name: 'cucumber-picocontainer', version: '6.10.4'
7298
}
7399

74100
shadowJar {

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Wed Oct 23 15:55:29 CEST 2019
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
2+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
33
distributionBase=GRADLE_USER_HOME
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists

src/integrationTest/kotlin/com/pubnub/api/integration/BaseIntegrationTest.kt

+2-6
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,14 @@ abstract class BaseIntegrationTest {
1414

1515
protected val logger = LoggerFactory.getLogger(this.javaClass.simpleName)
1616

17-
lateinit var pubnub: PubNub
18-
lateinit var server: PubNub
17+
val pubnub: PubNub by lazy { createPubNub() }
18+
val server: PubNub by lazy { createServer() }
1919

2020
private var mGuestClients = mutableListOf<PubNub>()
2121

2222
@Before
2323
fun before() {
2424
onPrePubnub()
25-
pubnub = createPubNub()
26-
if (needsServer()) {
27-
server = createServer()
28-
}
2925
onBefore()
3026
}
3127

0 commit comments

Comments
 (0)