diff --git a/.github/workflows/release/js-pre-npm-build.sh b/.github/workflows/release/js-pre-npm-build.sh index a37b84d8..725026bc 100755 --- a/.github/workflows/release/js-pre-npm-build.sh +++ b/.github/workflows/release/js-pre-npm-build.sh @@ -1,4 +1,4 @@ -echo "Build Chat SDK module artifacts" +echo "Build JS Chat SDK module artifacts" pushd .. ./gradlew :jsNodeProductionLibraryDistribution ./gradlew :packJsPackage diff --git a/.github/workflows/release/kotlin-maven-build.sh b/.github/workflows/release/kotlin-maven-build.sh index 61f4e81c..a25eb7a3 100755 --- a/.github/workflows/release/kotlin-maven-build.sh +++ b/.github/workflows/release/kotlin-maven-build.sh @@ -1,5 +1,5 @@ set -e -echo "Build Chat SDK module artifacts" +echo "Build Kotlin and Swift Chat SDK module artifacts" ./gradlew -PENABLE_TARGET_IOS_ALL=true :podPublishReleaseXCFramework assemble find build/cocoapods/publish/release/PubNubChat.xcframework -exec touch -t 00000000 {} + rm -f build/cocoapods/publish/release/PubNubChat.xcframework.zip diff --git a/.github/workflows/release/kotlin-pre-publish.sh b/.github/workflows/release/kotlin-pre-publish.sh index 22cecfb8..99b3c6b0 100755 --- a/.github/workflows/release/kotlin-pre-publish.sh +++ b/.github/workflows/release/kotlin-pre-publish.sh @@ -1,4 +1,5 @@ set -e +echo "Update Swift Chat SDK checksum in Package.swift" ./gradlew -PENABLE_TARGET_IOS_ALL=true :podPublishReleaseXCFramework find build/cocoapods/publish/release/PubNubChat.xcframework -exec touch -t 00000000 {} + rm -f build/cocoapods/publish/release/PubNubChat.xcframework.zip diff --git a/build-logic/gradle-plugins/build.gradle.kts b/build-logic/gradle-plugins/build.gradle.kts index 206bea52..36b26e67 100644 --- a/build-logic/gradle-plugins/build.gradle.kts +++ b/build-logic/gradle-plugins/build.gradle.kts @@ -22,18 +22,6 @@ gradlePlugin { id = "pubnub.dokka" implementationClass = "com.pubnub.gradle.PubNubDokkaPlugin" } - register("pubnubInteg") { - id = "pubnub.integration-test" - implementationClass = "com.pubnub.gradle.PubNubIntegrationTestPlugin" - } - register("pubnubTest") { - id = "pubnub.test" - implementationClass = "com.pubnub.gradle.PubNubTestPlugin" - } - register("pubnubJavaLibrary") { - id = "pubnub.java-library" - implementationClass = "com.pubnub.gradle.PubNubJavaLibraryPlugin" - } register("pubnubKotlinLibrary") { id = "pubnub.kotlin-library" implementationClass = "com.pubnub.gradle.PubNubKotlinLibraryPlugin" diff --git a/build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubIntegrationTestPlugin.kt b/build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubIntegrationTestPlugin.kt deleted file mode 100644 index 1987ebdf..00000000 --- a/build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubIntegrationTestPlugin.kt +++ /dev/null @@ -1,44 +0,0 @@ -package com.pubnub.gradle - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.plugins.JavaLibraryPlugin -import org.gradle.api.tasks.SourceSetContainer -import org.gradle.api.tasks.testing.Test -import org.gradle.kotlin.dsl.apply -import org.gradle.kotlin.dsl.configure -import org.gradle.kotlin.dsl.register - -class PubNubIntegrationTestPlugin : Plugin { - override fun apply(target: Project) { - with(target) { - apply() - - val integrationTestTask = tasks.register("integrationTest") { - description = "Runs integration tests." - group = "verification" - - useJUnitPlatform() - testLogging { - it.events("passed") - } - } - - configure { - val integrationTestSourceSet = create("integrationTest") { - it.compileClasspath += getByName("main").output - it.runtimeClasspath += getByName("main").output - } - integrationTestTask.configure { - it.testClassesDirs = integrationTestSourceSet.output.classesDirs - it.classpath = integrationTestSourceSet.runtimeClasspath - } - } - - configurations.getByName("integrationTestImplementation") { - it.extendsFrom(configurations.getByName("implementation")) - it.extendsFrom(configurations.getByName("testImplementation")) - } - } - } -} \ No newline at end of file diff --git a/build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubJavaLibraryPlugin.kt b/build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubJavaLibraryPlugin.kt deleted file mode 100644 index f06feaf7..00000000 --- a/build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubJavaLibraryPlugin.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.pubnub.gradle - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.plugins.JavaLibraryPlugin -import org.gradle.api.plugins.JavaPluginExtension -import org.gradle.api.plugins.quality.Checkstyle -import org.gradle.api.plugins.quality.CheckstyleExtension -import org.gradle.api.plugins.quality.CheckstylePlugin -import org.gradle.api.tasks.SourceSetContainer -import org.gradle.api.tasks.compile.JavaCompile -import org.gradle.jvm.toolchain.JavaLanguageVersion -import org.gradle.kotlin.dsl.apply -import org.gradle.kotlin.dsl.configure -import org.gradle.kotlin.dsl.getByType -import org.gradle.kotlin.dsl.withType - -class PubNubJavaLibraryPlugin : Plugin { - override fun apply(target: Project) { - with(target) { - apply() - apply() - apply() - - tasks.withType().configureEach { - it.options.compilerArgs.add("-parameters") - } - - extensions.configure { - toolchain { - it.languageVersion.set(JavaLanguageVersion.of(8)) - } - } - - extensions.configure { - toolVersion = "8.14" - configFile = rootProject.file("config/checkstyle/checkstyle.xml") - sourceSets = listOf(extensions.getByType().getByName("main")) - } - - tasks.withType().configureEach { - it.exclude("**/vendor/**", "**/*Test*") - - it.reports { report -> - report.xml.required.set(true) - report.html.required.set(true) - } - } - - } - } -} \ No newline at end of file diff --git a/build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubTestPlugin.kt b/build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubTestPlugin.kt deleted file mode 100644 index 73967ae7..00000000 --- a/build-logic/gradle-plugins/src/main/kotlin/com/pubnub/gradle/PubNubTestPlugin.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.pubnub.gradle - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.plugins.JavaLibraryPlugin -import org.gradle.api.tasks.testing.Test -import org.gradle.kotlin.dsl.apply -import org.gradle.kotlin.dsl.named -import org.gradle.kotlin.dsl.withType -import org.gradle.testing.jacoco.plugins.JacocoPlugin -import org.gradle.testing.jacoco.tasks.JacocoReport - -class PubNubTestPlugin : Plugin { - override fun apply(target: Project) { - with(target) { - apply() - apply() - - // Tests - tasks.named("test").configure { test -> - test.failFast = true - test.exclude("**/contract/*.class") - test.useJUnitPlatform() - } - - tasks.withType().configureEach { task -> - task.reports { - it.xml.required.set(true) - it.html.required.set(true) - } - } - } - } -} \ No newline at end of file