[KMP] JS CustomMessageType support + build tweaks (#321)

* [KMP] JS CustomMessageType support + build tweaks * PubNub SDK v10.3.1 release. --------- Co-authored-by: PubNub Release Bot <120067856+pubnub-release-bot@users.noreply.github.com>
pubnub · Dec 12, 2024 · 31d5360 · 31d5360
1 parent e82e27a
commit 31d5360
Show file tree

Hide file tree

Showing 22 changed files with 94 additions and 221 deletions.
diff --git a/.github/workflows/commands-handler.yml b/.github/workflows/commands-handler.yml
@@ -12,7 +12,7 @@ jobs:
     name: Process command
     if: github.event.issue.pull_request && endsWith(github.repository, '-private') != true
     runs-on:
-      group: organization/Default
+      group: macos-gh
     steps:
       - name: Check referred user
         id: user-check

diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ out/
 test.properties
 local.properties
 *.DS_STORE
+*.podspec
 
 # GitHub Actions #
 ##################

diff --git a/.pubnub.yml b/.pubnub.yml
@@ -1,9 +1,9 @@
 name: kotlin
-version: 10.3.0
+version: 10.3.1
 schema: 1
 scm: github.com/pubnub/kotlin
 files:
-  - build/libs/pubnub-kotlin-10.3.0-all.jar
+  - build/libs/pubnub-kotlin-10.3.1-all.jar
 sdks:
   - 
       type: library
@@ -23,8 +23,8 @@ sdks:
             -
               distribution-type: library
               distribution-repository: maven
-              package-name: pubnub-kotlin-10.3.0
-              location: https://repo.maven.apache.org/maven2/com/pubnub/pubnub-kotlin/10.3.0/pubnub-kotlin-10.3.0.jar
+              package-name: pubnub-kotlin-10.3.1
+              location: https://repo.maven.apache.org/maven2/com/pubnub/pubnub-kotlin/10.3.1/pubnub-kotlin-10.3.1.jar
               supported-platforms:
                 supported-operating-systems:
                   Android:
@@ -114,6 +114,11 @@ sdks:
                   license-url: https://www.apache.org/licenses/LICENSE-2.0.txt
                   is-required: Required
 changelog:
+  - date: 2024-12-12
+    version: v10.3.1
+    changes:
+      - type: improvement
+        text: "Internal changes for Chat SDK."
   - date: 2024-12-05
     version: v10.3.0
     changes:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v10.3.1
+December 12 2024
+
+#### Modified
+- Internal changes for Chat SDK.
+
 ## v10.3.0
 December 05 2024
 

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ You will need the publish and subscribe keys to authenticate your app. Get your
      <dependency>
         <groupId>com.pubnub</groupId>
         <artifactId>pubnub-kotlin</artifactId>
-        <version>10.3.0</version>
+        <version>10.3.1</version>
      </dependency>
      ```
 

diff --git a/...logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubKotlinMultiplatformPlugin.kt b/...logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubKotlinMultiplatformPlugin.kt
@@ -2,6 +2,7 @@ package com.pubnub.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.api.plugins.ExtensionAware
 import org.gradle.api.tasks.testing.AbstractTestTask
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
@@ -38,9 +39,16 @@ class PubNubKotlinMultiplatformPlugin : Plugin<Project> {
                         }
 
                         pod("PubNubSwift") {
-//                            val swiftPath = project.findProperty("SWIFT_PATH") as? String ?: "swift"
-//                            source = path(rootProject.file(swiftPath))
-                            version = "8.2.2"
+                            val swiftPath = project.findProperty("SWIFT_PATH") as? String
+                            if (swiftPath != null) {
+                                source = path(rootProject.file(swiftPath))
+                            } else {
+                                version = project.rootProject
+                                    .extensions
+                                    .getByType(VersionCatalogsExtension::class.java)
+                                    .named("libs")
+                                    .findVersion("pubnub.swift").get().requiredVersion
+                            }
                             moduleName = "PubNubSDK"
                             extraOpts += listOf("-compiler-option", "-fmodules")
                         }

diff --git a/gradle.properties b/gradle.properties
@@ -18,7 +18,7 @@ RELEASE_SIGNING_ENABLED=true
 SONATYPE_HOST=DEFAULT
 SONATYPE_AUTOMATIC_RELEASE=false
 GROUP=com.pubnub
-VERSION_NAME=10.3.0
+VERSION_NAME=10.3.1
 POM_PACKAGING=jar
 
 POM_NAME=PubNub SDK
@@ -39,7 +39,7 @@ POM_DEVELOPER_NAME=PubNub
 POM_DEVELOPER_URL=support@pubnub.com
 
 IOS_SIMULATOR_ID=iPhone 15 Pro
-SWIFT_PATH=swift
+#SWIFT_PATH=../swift
 
 ENABLE_TARGET_JS=true
 ENABLE_TARGET_IOS_OTHER=false

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,7 +10,9 @@ vanniktech = "0.29.0"
 ktlint = "12.1.0"
 dokka = "1.9.20"
 kotlinx_datetime = "0.6.1"
-kotlinx_coroutines = "1.8.1"
+kotlinx_coroutines = "1.9.0"
+pubnub_js = "8.3.1"
+pubnub_swift = "8.2.2"
 
 [libraries]
 retrofit2 = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit2" }

diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
@@ -659,10 +659,10 @@ proxy-from-env@^1.1.0:
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
 
-pubnub@8.2.8:
-  version "8.2.8"
-  resolved "https://registry.yarnpkg.com/pubnub/-/pubnub-8.2.8.tgz#68d3b84d07e128b29f74c6c46495f0c5bedd1a3f"
-  integrity sha512-OREW+YDWWocOaz16jbrrybD0AyqEFuskCGi+EMgOb9FUJkuYPnInjlMSAUBBrlx7lMTARMQxx3Sk0EIvbB3hig==
+pubnub@8.3.1:
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/pubnub/-/pubnub-8.3.1.tgz#48b6c2468452427c9d1aa9a51e78781d25eec660"
+  integrity sha512-+aFp84Jsqpmu9utci8uQhABTMoh1Uk8UafGS1QANSkceXX3HDRTQnpTw8itH0UchzCS9pSfUATTl+Ay3jvM5EA==
   dependencies:
     agentkeepalive "^3.5.2"
     buffer "^6.0.3"

diff --git a/pubnub-kotlin/pubnub-kotlin-api/PubNubKMP.podspec b/pubnub-kotlin/pubnub-kotlin-api/PubNubKMP.podspec
diff --git a/pubnub-kotlin/pubnub-kotlin-api/build.gradle.kts b/pubnub-kotlin/pubnub-kotlin-api/build.gradle.kts
@@ -49,7 +49,7 @@ kotlin {
         if (enableJsTarget) {
             val jsMain by getting {
                 dependencies {
-                    implementation(npm("pubnub", "8.2.8"))
+                    implementation(npm("pubnub", libs.versions.pubnub.js.get()))
                 }
             }
         }

diff --git a/pubnub-kotlin/pubnub-kotlin-api/config/ktlint/baseline.xml b/pubnub-kotlin/pubnub-kotlin-api/config/ktlint/baseline.xml
@@ -8,32 +8,28 @@
     </file>
     <file name="src/jsMain/kotlin/Pubnub.d.kt">
         <error line="156" column="40" source="standard:comment-wrapping" />
-        <error line="409" column="15" source="standard:class-naming" />
-        <error line="425" column="15" source="standard:class-naming" />
-        <error line="441" column="15" source="standard:class-naming" />
-        <error line="453" column="15" source="standard:class-naming" />
-        <error line="461" column="15" source="standard:class-naming" />
-        <error line="469" column="15" source="standard:class-naming" />
-        <error line="485" column="15" source="standard:class-naming" />
-        <error line="498" column="15" source="standard:class-naming" />
-        <error line="845" column="13" source="standard:property-naming" />
-        <error line="1030" column="15" source="standard:class-naming" />
-        <error line="1036" column="15" source="standard:class-naming" />
-        <error line="1156" column="13" source="standard:property-naming" />
-        <error line="1162" column="13" source="standard:property-naming" />
-        <error line="1164" column="13" source="standard:property-naming" />
-        <error line="1224" column="39" source="standard:comment-wrapping" />
-        <error line="1309" column="15" source="standard:class-naming" />
-        <error line="1337" column="42" source="standard:comment-wrapping" />
-        <error line="1387" column="37" source="standard:comment-wrapping" />
-        <error line="1408" column="13" source="standard:property-naming" />
-        <error line="1409" column="13" source="standard:property-naming" />
+        <error line="411" column="15" source="standard:class-naming" />
+        <error line="428" column="15" source="standard:class-naming" />
+        <error line="444" column="15" source="standard:class-naming" />
+        <error line="456" column="15" source="standard:class-naming" />
+        <error line="464" column="15" source="standard:class-naming" />
+        <error line="472" column="15" source="standard:class-naming" />
+        <error line="488" column="15" source="standard:class-naming" />
+        <error line="501" column="15" source="standard:class-naming" />
+        <error line="849" column="13" source="standard:property-naming" />
+        <error line="1034" column="15" source="standard:class-naming" />
+        <error line="1040" column="15" source="standard:class-naming" />
+        <error line="1160" column="13" source="standard:property-naming" />
+        <error line="1166" column="13" source="standard:property-naming" />
+        <error line="1168" column="13" source="standard:property-naming" />
+        <error line="1228" column="39" source="standard:comment-wrapping" />
+        <error line="1313" column="15" source="standard:class-naming" />
+        <error line="1341" column="42" source="standard:comment-wrapping" />
+        <error line="1391" column="37" source="standard:comment-wrapping" />
+        <error line="1412" column="13" source="standard:property-naming" />
         <error line="1413" column="13" source="standard:property-naming" />
-        <error line="1414" column="13" source="standard:property-naming" />
-        <error line="1433" column="9" source="standard:property-naming" />
-        <error line="1434" column="9" source="standard:property-naming" />
-        <error line="1435" column="9" source="standard:property-naming" />
-        <error line="1436" column="9" source="standard:property-naming" />
+        <error line="1417" column="13" source="standard:property-naming" />
+        <error line="1418" column="13" source="standard:property-naming" />
         <error line="1437" column="9" source="standard:property-naming" />
         <error line="1438" column="9" source="standard:property-naming" />
         <error line="1439" column="9" source="standard:property-naming" />
@@ -43,10 +39,10 @@
         <error line="1443" column="9" source="standard:property-naming" />
         <error line="1444" column="9" source="standard:property-naming" />
         <error line="1445" column="9" source="standard:property-naming" />
+        <error line="1446" column="9" source="standard:property-naming" />
+        <error line="1447" column="9" source="standard:property-naming" />
+        <error line="1448" column="9" source="standard:property-naming" />
         <error line="1449" column="9" source="standard:property-naming" />
-        <error line="1450" column="9" source="standard:property-naming" />
-        <error line="1451" column="9" source="standard:property-naming" />
-        <error line="1452" column="9" source="standard:property-naming" />
         <error line="1453" column="9" source="standard:property-naming" />
         <error line="1454" column="9" source="standard:property-naming" />
         <error line="1455" column="9" source="standard:property-naming" />
@@ -79,5 +75,9 @@
         <error line="1482" column="9" source="standard:property-naming" />
         <error line="1483" column="9" source="standard:property-naming" />
         <error line="1484" column="9" source="standard:property-naming" />
+        <error line="1485" column="9" source="standard:property-naming" />
+        <error line="1486" column="9" source="standard:property-naming" />
+        <error line="1487" column="9" source="standard:property-naming" />
+        <error line="1488" column="9" source="standard:property-naming" />
     </file>
 </baseline>
diff --git a/pubnub-kotlin/pubnub-kotlin-api/pubnub_kotlin_api.podspec b/pubnub-kotlin/pubnub-kotlin-api/pubnub_kotlin_api.podspec
diff --git a/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/kmp/factories.ios.kt b/pubnub-kotlin/pubnub-kotlin-api/src/appleMain/kotlin/com/pubnub/kmp/factories.ios.kt
@@ -176,7 +176,7 @@ private fun createFileEventResult(from: KMPFileChangeEvent?): PNFileEventResult
             id = from.file().id(),
             name = from.file().name(),
             url = from.file().url()?.absoluteString.orEmpty()
-        )
+        ),
     )
 }
 

diff --git a/...kotlin/pubnub-kotlin-api/src/commonTest/kotlin/com/pubnub/test/integration/PublishTest.kt b/...kotlin/pubnub-kotlin-api/src/commonTest/kotlin/com/pubnub/test/integration/PublishTest.kt
@@ -185,6 +185,18 @@ class PublishTest : BaseIntegrationTest() {
             assertEquals("123", result2.userMetadata?.asString())
         }
     }
+
+    @Test
+    fun publish_with_custom_message_type() = runTest {
+        val customMessageType = randomString()
+        pubnub.test(backgroundScope) {
+            pubnub.awaitSubscribe(listOf(channel))
+            pubnub.publish(channel, "some message", customMessageType = customMessageType).await()
+            val result = nextMessage()
+            assertEquals("some message", result.message.asString())
+            assertEquals(customMessageType, result.customMessageType)
+        }
+    }
 }
 
 private fun deepCompare(expected: Any?, actual: JsonElement) {
-Original file line number
+Diff line change
@@ Expand Up @@
                 id = from.file().id(),
                 name = from.file().name(),
                 url = from.file().url()?.absoluteString.orEmpty()
-            )
+            ),
         )
     }
@@ Expand Down @@