Skip to content

Commit

Permalink
Jackson library bump (#19)
Browse files Browse the repository at this point in the history
  • Loading branch information
kleewho authored Apr 19, 2022
1 parent fde4929 commit 095abda
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 15 deletions.
17 changes: 11 additions & 6 deletions .pubnub.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: kotlin
version: 7.0.0
version: 7.0.1
schema: 1
scm: github.com/pubnub/kotlin
files:
- build/libs/pubnub-kotlin-7.0.0-all.jar
- build/libs/pubnub-kotlin-7.0.1-all.jar
sdks:
-
type: library
Expand All @@ -23,8 +23,8 @@ sdks:
-
distribution-type: library
distribution-repository: GitHub
package-name: pubnub-kotlin-7.0.0
location: https://github.com/pubnub/kotlin/releases/download/v7.0.0/pubnub-kotlin-7.0.0-all.jar
package-name: pubnub-kotlin-7.0.1
location: https://github.com/pubnub/kotlin/releases/download/v7.0.1/pubnub-kotlin-7.0.1-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-kotlin-7.0.0
location: https://repo.maven.apache.org/maven2/com/pubnub/pubnub-kotlin/7.0.0/pubnub-kotlin-7.0.0.jar
package-name: pubnub-kotlin-7.0.1
location: https://repo.maven.apache.org/maven2/com/pubnub/pubnub-kotlin/7.0.1/pubnub-kotlin-7.0.1.jar
supported-platforms:
supported-operating-systems:
Android:
Expand Down Expand Up @@ -233,6 +233,11 @@ sdks:
license-url: https://github.com/stleary/JSON-java/blob/20210307/LICENSE
is-required: Required
changelog:
- date: 2022-04-19
version: v7.0.1
changes:
- type: bug
text: "Update Jackson library with fixes for CVE-2020-36518."
- date: 2022-01-12
version: v7.0.0
changes:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## v7.0.1
April 19 2022

#### Fixed
- Update Jackson library with fixes for CVE-2020-36518.

## v7.0.0
January 12 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>7.0.0</version>
<version>7.0.1</version>
</dependency>
```

* for Gradle, add the following dependency in your `gradle.build`:
```groovy
implementation 'com.pubnub:pubnub-kotlin:7.0.0'
implementation 'com.pubnub:pubnub-kotlin:7.0.1'
```

2. Configure your keys:
Expand Down
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'org.jetbrains.kotlin.jvm' version '1.3.72'
id 'org.jetbrains.kotlin.jvm' version '1.5.30'
id 'maven'
id 'com.github.johnrengelman.shadow' version '6.1.0'
id 'java-library'
Expand All @@ -13,7 +13,7 @@ plugins {
}

group = 'com.pubnub'
version = '7.0.0'
version = '7.0.1'

repositories {
mavenCentral()
Expand Down Expand Up @@ -53,9 +53,9 @@ dependencies {

api 'com.google.code.gson:gson:2.8.6'
implementation "com.squareup.retrofit2:converter-gson:2.9.0"
implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.2'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.3'
compile 'com.fasterxml.jackson.module:jackson-module-kotlin:2.12.2'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.2'
compile 'com.fasterxml.jackson.module:jackson-module-kotlin:2.13.2'
implementation "org.slf4j:slf4j-api:1.7.30"

implementation "org.json:json:20210307"
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/pubnub/api/PubNub.kt
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class PubNub(val configuration: PNConfiguration) {

companion object {
private const val TIMESTAMP_DIVIDER = 1000
private const val SDK_VERSION = "7.0.0"
private const val SDK_VERSION = "7.0.1"
private const val MAX_SEQUENCE = 65535

/**
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/pubnub/api/legacy/PubNubTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class PubNubTest : BaseTest() {
fun getVersionAndTimeStamp() {
val version = pubnub.version
val timeStamp = pubnub.timestamp()
assertEquals("7.0.0", version)
assertEquals("7.0.1", version)
assertTrue(timeStamp > 0)
}
}

0 comments on commit 095abda

Please sign in to comment.