Skip to content

Commit 0e292a7

Browse files
Remove swift submodule (#286)
* Remove swift submodule * Ignore flaky test * PubNub SDK v10.0.0 release. * Update .pubnub.yml --------- Co-authored-by: PubNub Release Bot <[email protected]>
1 parent e0f2a7b commit 0e292a7

File tree

10 files changed

+40
-20
lines changed

10 files changed

+40
-20
lines changed

.gitmodules

-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
[submodule "swift"]
2-
path = swift
3-
url = https://github.com/pubnub/swift
4-
branch = feat/kmp2

.pubnub.yml

+17-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: kotlin
2-
version: 9.2.4
2+
version: 10.0.0
33
schema: 1
44
scm: github.com/pubnub/kotlin
55
files:
6-
- build/libs/pubnub-kotlin-9.2.4-all.jar
6+
- build/libs/pubnub-kotlin-10.0.0-all.jar
77
sdks:
88
-
99
type: library
@@ -23,8 +23,8 @@ sdks:
2323
-
2424
distribution-type: library
2525
distribution-repository: maven
26-
package-name: pubnub-kotlin-9.2.4
27-
location: https://repo.maven.apache.org/maven2/com/pubnub/pubnub-kotlin/9.2.4/pubnub-kotlin-9.2.4.jar
26+
package-name: pubnub-kotlin-10.0.0
27+
location: https://repo.maven.apache.org/maven2/com/pubnub/pubnub-kotlin/10.0.0/pubnub-kotlin-10.0.0.jar
2828
supported-platforms:
2929
supported-operating-systems:
3030
Android:
@@ -114,6 +114,19 @@ sdks:
114114
license-url: https://www.apache.org/licenses/LICENSE-2.0.txt
115115
is-required: Required
116116
changelog:
117+
- date: 2024-09-24
118+
version: v10.0.0
119+
changes:
120+
- type: feature
121+
text: "`PatchValue` is now used in objects returning optional data from the server, such as `PNChannelMetadata`, `PNUUIDMetadata` for example."
122+
- type: feature
123+
text: "Removed mutable `PNConfiguration` classes which were deprecated in previous releases."
124+
- type: feature
125+
text: "PNConfiguration.retryConfiguration is now enabled by default only for Subscribe requests and set to Exponential."
126+
- type: bug
127+
text: "A migration script is provided with this release to help with package name changes."
128+
- type: improvement
129+
text: "Please consult the migration guide for JVM SDKs version 10.0.0 for required changes to your code."
117130
- date: 2024-08-19
118131
version: v9.2.4
119132
changes:

CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
## v10.0.0
2+
September 24 2024
3+
4+
#### Added
5+
- `PatchValue` is now used in objects returning optional data from the server, such as `PNChannelMetadata`, `PNUUIDMetadata` for example.
6+
- Removed mutable `PNConfiguration` classes which were deprecated in previous releases.
7+
8+
#### Fixed
9+
- A migration script is provided with this release to help with package name changes.
10+
11+
#### Modified
12+
- Please consult the migration guide for JVM SDKs version 10.0.0 for required changes to your code.
13+
114
## v9.2.4
215
August 19 2024
316

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ You will need the publish and subscribe keys to authenticate your app. Get your
2020
<dependency>
2121
<groupId>com.pubnub</groupId>
2222
<artifactId>pubnub-kotlin</artifactId>
23-
<version>9.2.4</version>
23+
<version>10.0.0</version>
2424
</dependency>
2525
```
2626

2727
* for Gradle, add the following dependency in your `gradle.build`:
2828
```groovy
29-
implementation 'com.pubnub:pubnub-kotlin:9.2.4'
29+
implementation 'com.pubnub:pubnub-kotlin:10.0.0'
3030
```
3131

3232
2. Configure your keys and create PubNub instance:

build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubKotlinMultiplatformPlugin.kt

+3-6
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,9 @@ class PubNubKotlinMultiplatformPlugin : Plugin<Project> {
106106
}
107107

108108
pod("PubNubSwift") {
109-
val swiftPath = project.findProperty("SWIFT_PATH") as? String ?: "swift"
110-
// source = git("https://github.com/pubnub/swift") {
111-
// branch = "feat/kmp"
112-
// }
113-
// version = "7.1.0"
114-
source = path(rootProject.file(swiftPath))
109+
// val swiftPath = project.findProperty("SWIFT_PATH") as? String ?: "swift"
110+
// source = path(rootProject.file(swiftPath))
111+
version = "8.0.0"
115112
moduleName = "PubNubSDK"
116113
extraOpts += listOf("-compiler-option", "-fmodules")
117114
}

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RELEASE_SIGNING_ENABLED=true
1818
SONATYPE_HOST=DEFAULT
1919
SONATYPE_AUTOMATIC_RELEASE=false
2020
GROUP=com.pubnub
21-
VERSION_NAME=9.2.4
21+
VERSION_NAME=10.0.0
2222
POM_PACKAGING=jar
2323

2424
POM_NAME=PubNub SDK

pubnub-kotlin/pubnub-kotlin-api/pubnub_kotlin_api.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Pod::Spec.new do |spec|
99
spec.vendored_frameworks = 'build/cocoapods/framework/pubnub_kotlin_api.framework'
1010
spec.libraries = 'c++'
1111
spec.ios.deployment_target = '14'
12-
spec.dependency 'PubNubSwift'
12+
spec.dependency 'PubNubSwift', '8.0.0'
1313

1414
if !Dir.exist?('build/cocoapods/framework/pubnub_kotlin_api.framework') || Dir.empty?('build/cocoapods/framework/pubnub_kotlin_api.framework')
1515
raise "

pubnub-kotlin/pubnub-kotlin-api/src/commonTest/kotlin/com/pubnub/test/integration/EntitiesTest.kt

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.pubnub.test.await
77
import com.pubnub.test.test
88
import kotlinx.coroutines.test.runTest
99
import kotlinx.coroutines.yield
10+
import kotlin.test.Ignore
1011
import kotlin.test.Test
1112
import kotlin.test.assertEquals
1213

@@ -23,6 +24,7 @@ class EntitiesTest : BaseIntegrationTest() {
2324
}
2425

2526
@Test
27+
@Ignore // TODO flaky test
2628
fun can_get_events_from_channel_subscription() = runTest {
2729
pubnub.test(backgroundScope) {
2830
val channel = pubnub.channel(channelName)

pubnub-kotlin/pubnub-kotlin-impl/src/test/kotlin/com/pubnub/api/legacy/PubNubImplTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class PubNubImplTest : BaseTest() {
5656
fun getVersionAndTimeStamp() {
5757
val version = PubNubImpl.SDK_VERSION
5858
val timeStamp = PubNubImpl.timestamp()
59-
assertEquals("9.2.4", version)
59+
assertEquals("10.0.0", version)
6060
assertTrue(timeStamp > 0)
6161
}
6262

swift

-1
This file was deleted.

0 commit comments

Comments
 (0)