Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove swift submodule #286

Merged
merged 4 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
[submodule "swift"]
path = swift
url = https://github.com/pubnub/swift
branch = feat/kmp2
19 changes: 15 additions & 4 deletions .pubnub.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: kotlin
version: 9.2.4
version: 10.0.0
schema: 1
scm: github.com/pubnub/kotlin
files:
- build/libs/pubnub-kotlin-9.2.4-all.jar
- build/libs/pubnub-kotlin-10.0.0-all.jar
sdks:
-
type: library
Expand All @@ -23,8 +23,8 @@ sdks:
-
distribution-type: library
distribution-repository: maven
package-name: pubnub-kotlin-9.2.4
location: https://repo.maven.apache.org/maven2/com/pubnub/pubnub-kotlin/9.2.4/pubnub-kotlin-9.2.4.jar
package-name: pubnub-kotlin-10.0.0
location: https://repo.maven.apache.org/maven2/com/pubnub/pubnub-kotlin/10.0.0/pubnub-kotlin-10.0.0.jar
supported-platforms:
supported-operating-systems:
Android:
Expand Down Expand Up @@ -114,6 +114,17 @@ sdks:
license-url: https://www.apache.org/licenses/LICENSE-2.0.txt
is-required: Required
changelog:
- date: 2024-09-24
version: v10.0.0
changes:
- type: feature
text: "`PatchValue` is now used in objects returning optional data from the server, such as `PNChannelMetadata`, `PNUUIDMetadata` for example."
- type: feature
text: "Removed mutable `PNConfiguration` classes which were deprecated in previous releases."
- type: bug
text: "A migration script is provided with this release to help with package name changes."
- type: improvement
text: "Please consult the migration guide for JVM SDKs version 10.0.0 for required changes to your code."
- date: 2024-08-19
version: v9.2.4
changes:
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
## v10.0.0
September 24 2024

#### Added
- `PatchValue` is now used in objects returning optional data from the server, such as `PNChannelMetadata`, `PNUUIDMetadata` for example.
- Removed mutable `PNConfiguration` classes which were deprecated in previous releases.

#### Fixed
- A migration script is provided with this release to help with package name changes.

#### Modified
- Please consult the migration guide for JVM SDKs version 10.0.0 for required changes to your code.

## v9.2.4
August 19 2024

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

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

2. Configure your keys and create PubNub instance:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,9 @@ class PubNubKotlinMultiplatformPlugin : Plugin<Project> {
}

pod("PubNubSwift") {
val swiftPath = project.findProperty("SWIFT_PATH") as? String ?: "swift"
// source = git("https://github.com/pubnub/swift") {
// branch = "feat/kmp"
// }
// version = "7.1.0"
source = path(rootProject.file(swiftPath))
// val swiftPath = project.findProperty("SWIFT_PATH") as? String ?: "swift"
// source = path(rootProject.file(swiftPath))
version = "8.0.0"
moduleName = "PubNubSDK"
extraOpts += listOf("-compiler-option", "-fmodules")
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RELEASE_SIGNING_ENABLED=true
SONATYPE_HOST=DEFAULT
SONATYPE_AUTOMATIC_RELEASE=false
GROUP=com.pubnub
VERSION_NAME=9.2.4
VERSION_NAME=10.0.0
POM_PACKAGING=jar

POM_NAME=PubNub SDK
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Pod::Spec.new do |spec|
spec.vendored_frameworks = 'build/cocoapods/framework/pubnub_kotlin_api.framework'
spec.libraries = 'c++'
spec.ios.deployment_target = '14'
spec.dependency 'PubNubSwift'
spec.dependency 'PubNubSwift', '8.0.0'

if !Dir.exist?('build/cocoapods/framework/pubnub_kotlin_api.framework') || Dir.empty?('build/cocoapods/framework/pubnub_kotlin_api.framework')
raise "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import com.pubnub.test.await
import com.pubnub.test.test
import kotlinx.coroutines.test.runTest
import kotlinx.coroutines.yield
import kotlin.test.Ignore
import kotlin.test.Test
import kotlin.test.assertEquals

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

@Test
@Ignore // TODO flaky test
fun can_get_events_from_channel_subscription() = runTest {
pubnub.test(backgroundScope) {
val channel = pubnub.channel(channelName)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class PubNubImplTest : BaseTest() {
fun getVersionAndTimeStamp() {
val version = PubNubImpl.SDK_VERSION
val timeStamp = PubNubImpl.timestamp()
assertEquals("9.2.4", version)
assertEquals("10.0.0", version)
assertTrue(timeStamp > 0)
}

Expand Down
1 change: 0 additions & 1 deletion swift
Submodule swift deleted from 7ec970
Loading