diff --git a/.pubnub.yml b/.pubnub.yml index bae1bca85..05b8dd226 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -1,9 +1,9 @@ name: kotlin -version: 10.2.0 +version: 10.2.1 schema: 1 scm: github.com/pubnub/kotlin files: - - build/libs/pubnub-kotlin-10.2.0-all.jar + - build/libs/pubnub-kotlin-10.2.1-all.jar sdks: - type: library @@ -23,8 +23,8 @@ sdks: - distribution-type: library distribution-repository: maven - package-name: pubnub-kotlin-10.2.0 - location: https://repo.maven.apache.org/maven2/com/pubnub/pubnub-kotlin/10.2.0/pubnub-kotlin-10.2.0.jar + package-name: pubnub-kotlin-10.2.1 + location: https://repo.maven.apache.org/maven2/com/pubnub/pubnub-kotlin/10.2.1/pubnub-kotlin-10.2.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-03 + version: v10.2.1 + changes: + - type: improvement + text: "Internal changes in preparation for other releases." - date: 2024-11-18 version: v10.2.0 changes: diff --git a/CHANGELOG.md b/CHANGELOG.md index 364a49886..026bf0e01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## v10.2.1 +December 03 2024 + +#### Modified +- Internal changes in preparation for other releases. + ## v10.2.0 November 18 2024 diff --git a/README.md b/README.md index 4fdca81e1..440ff75c1 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ You will need the publish and subscribe keys to authenticate your app. Get your com.pubnub pubnub-kotlin - 10.2.0 + 10.2.1 ``` diff --git a/build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubSharedPlugin.kt b/build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubSharedPlugin.kt index 92c6388db..7e18c47e0 100644 --- a/build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubSharedPlugin.kt +++ b/build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubSharedPlugin.kt @@ -16,16 +16,17 @@ import org.jlleitschuh.gradle.ktlint.KtlintPlugin class PubNubSharedPlugin : Plugin { override fun apply(target: Project) { with(target) { - apply() - apply() - - extensions.configure { - repositories { - it.maven(uri(rootProject.layout.buildDirectory.dir("repo"))) { -> - name = "repo" + if (!target.name.endsWith("-test")) { + apply() + extensions.configure { + repositories { + it.maven(uri(rootProject.layout.buildDirectory.dir("repo"))) { -> + name = "repo" + } } } } + apply() group = providers.gradleProperty("GROUP").get() version = providers.gradleProperty("VERSION_NAME").get() diff --git a/gradle.properties b/gradle.properties index 9d7c5d551..aad1df2cd 100644 --- 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.2.0 +VERSION_NAME=10.2.1 POM_PACKAGING=jar POM_NAME=PubNub SDK diff --git a/pubnub-kotlin/pubnub-kotlin-impl/src/test/kotlin/com/pubnub/api/legacy/PubNubImplTest.kt b/pubnub-kotlin/pubnub-kotlin-impl/src/test/kotlin/com/pubnub/api/legacy/PubNubImplTest.kt index 1a7897f19..184856ac8 100644 --- a/pubnub-kotlin/pubnub-kotlin-impl/src/test/kotlin/com/pubnub/api/legacy/PubNubImplTest.kt +++ b/pubnub-kotlin/pubnub-kotlin-impl/src/test/kotlin/com/pubnub/api/legacy/PubNubImplTest.kt @@ -56,7 +56,7 @@ class PubNubImplTest : BaseTest() { fun getVersionAndTimeStamp() { val version = PubNubImpl.SDK_VERSION val timeStamp = PubNubImpl.timestamp() - assertEquals("10.2.0", version) + assertEquals("10.2.1", version) assertTrue(timeStamp > 0) } diff --git a/pubnub-kotlin/pubnub-kotlin-test/PubNubKMPTest.podspec b/pubnub-kotlin/pubnub-kotlin-test/PubNubKMPTest.podspec deleted file mode 100644 index 5397baf96..000000000 --- a/pubnub-kotlin/pubnub-kotlin-test/PubNubKMPTest.podspec +++ /dev/null @@ -1,54 +0,0 @@ -Pod::Spec.new do |spec| - spec.name = 'PubNubKMPTest' - spec.version = '1.0' - spec.homepage = 'Link to a Kotlin/Native module homepage' - spec.source = { :http=> ''} - spec.authors = '' - spec.license = '' - spec.summary = 'Some description for a Kotlin/Native module' - spec.vendored_frameworks = 'build/cocoapods/framework/PubNubKMPTest.framework' - spec.libraries = 'c++' - spec.ios.deployment_target = '14' - spec.dependency 'PubNubSwift' - - if !Dir.exist?('build/cocoapods/framework/PubNubKMPTest.framework') || Dir.empty?('build/cocoapods/framework/PubNubKMPTest.framework') - raise " - - Kotlin framework 'PubNubKMPTest' doesn't exist yet, so a proper Xcode project can't be generated. - 'pod install' should be executed after running ':generateDummyFramework' Gradle task: - - ./gradlew :pubnub-kotlin:pubnub-kotlin-test:generateDummyFramework - - Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)" - end - - spec.xcconfig = { - 'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO', - } - - spec.pod_target_xcconfig = { - 'KOTLIN_PROJECT_PATH' => ':pubnub-kotlin:pubnub-kotlin-test', - 'PRODUCT_MODULE_NAME' => 'PubNubKMPTest', - } - - spec.script_phases = [ - { - :name => 'Build PubNubKMPTest', - :execution_position => :before_compile, - :shell_path => '/bin/sh', - :script => <<-SCRIPT - if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then - echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\"" - exit 0 - fi - set -ev - REPO_ROOT="$PODS_TARGET_SRCROOT" - "$REPO_ROOT/../../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \ - -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \ - -Pkotlin.native.cocoapods.archs="$ARCHS" \ - -Pkotlin.native.cocoapods.configuration="$CONFIGURATION" - SCRIPT - } - ] - -end \ No newline at end of file diff --git a/pubnub-kotlin/pubnub-kotlin-test/build.gradle.kts b/pubnub-kotlin/pubnub-kotlin-test/build.gradle.kts index 413dd9f95..cbf85454c 100644 --- a/pubnub-kotlin/pubnub-kotlin-test/build.gradle.kts +++ b/pubnub-kotlin/pubnub-kotlin-test/build.gradle.kts @@ -4,10 +4,10 @@ import java.util.Properties plugins { alias(libs.plugins.benmanes.versions) - alias(libs.plugins.codingfeline.buildkonfig) id("pubnub.shared") id("pubnub.ios-simulator-test") id("pubnub.base.multiplatform") + alias(libs.plugins.codingfeline.buildkonfig) } kotlin { diff --git a/pubnub-kotlin/pubnub-kotlin-test/pubnub_kotlin_test.podspec b/pubnub-kotlin/pubnub-kotlin-test/pubnub_kotlin_test.podspec deleted file mode 100644 index b0edffe07..000000000 --- a/pubnub-kotlin/pubnub-kotlin-test/pubnub_kotlin_test.podspec +++ /dev/null @@ -1,54 +0,0 @@ -Pod::Spec.new do |spec| - spec.name = 'pubnub_kotlin_test' - spec.version = '1.0' - spec.homepage = 'Link to a Kotlin/Native module homepage' - spec.source = { :http=> ''} - spec.authors = '' - spec.license = '' - spec.summary = 'Some description for a Kotlin/Native module' - spec.vendored_frameworks = 'build/cocoapods/framework/pubnub_kotlin_test.framework' - spec.libraries = 'c++' - spec.ios.deployment_target = '14' - spec.dependency 'PubNubSwift' - - if !Dir.exist?('build/cocoapods/framework/pubnub_kotlin_test.framework') || Dir.empty?('build/cocoapods/framework/pubnub_kotlin_test.framework') - raise " - - Kotlin framework 'pubnub_kotlin_test' doesn't exist yet, so a proper Xcode project can't be generated. - 'pod install' should be executed after running ':generateDummyFramework' Gradle task: - - ./gradlew :pubnub-kotlin:pubnub-kotlin-test:generateDummyFramework - - Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)" - end - - spec.xcconfig = { - 'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO', - } - - spec.pod_target_xcconfig = { - 'KOTLIN_PROJECT_PATH' => ':pubnub-kotlin:pubnub-kotlin-test', - 'PRODUCT_MODULE_NAME' => 'pubnub_kotlin_test', - } - - spec.script_phases = [ - { - :name => 'Build pubnub_kotlin_test', - :execution_position => :before_compile, - :shell_path => '/bin/sh', - :script => <<-SCRIPT - if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then - echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\"" - exit 0 - fi - set -ev - REPO_ROOT="$PODS_TARGET_SRCROOT" - "$REPO_ROOT/../../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \ - -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \ - -Pkotlin.native.cocoapods.archs="$ARCHS" \ - -Pkotlin.native.cocoapods.configuration="$CONFIGURATION" - SCRIPT - } - ] - -end \ No newline at end of file