Join

GetStream · Dec 24, 2024 · e9e2de3 · e9e2de3
1 parent befb979
commit e9e2de3
Show file tree

Hide file tree

Showing 18 changed files with 117 additions and 122 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -22,7 +22,6 @@ plugins {
     alias(libs.plugins.kotlin.compose) apply false
     alias(libs.plugins.androidx.baseline.profile) apply false
     alias(libs.plugins.ksp) apply false
-    alias(libs.plugins.gitversioner) apply false
     alias(libs.plugins.android.junit5) apply false
     alias(libs.plugins.paparazzi) apply false
     alias(libs.plugins.google.services) apply false
@@ -38,6 +37,7 @@ plugins {
     id("io.getstream.chat.MinorBumpPlugin")
     id("io.getstream.chat.VersionPrintPlugin")
     id("io.getstream.chat.ChangelogAddModelSectionPlugin")
+    alias(libs.plugins.gitversioner)
     alias(libs.plugins.gradle.versions)
     alias(libs.plugins.nexus.publish)
     alias(libs.plugins.binary.compatibility.validator)

diff --git a/scripts/sample-app-versioner.gradle b/scripts/sample-app-versioner.gradle
@@ -12,9 +12,6 @@ def isCI = System.getenv('CI')
 ext["sampleAppVersionCode"] = 1
 ext["sampleAppVersionName"] = Configuration.versionName
 if (isCI && gitIsAvailable()) {
-    plugins {
-        alias libs.plugins.gitversioner
-    }
     gitVersioner {
         def branches = ['develop', 'main', 'release']
         baseBranch branchName in branches ? branchName : branches[0]

diff --git a/stream-chat-android-client-test/build.gradle.kts b/stream-chat-android-client-test/build.gradle.kts
@@ -5,8 +5,8 @@ plugins {
     alias(libs.plugins.kotlin.android)
 }
 
-apply(from = "${rootDir}/scripts/android.gradle")
-apply(from = "${rootDir}/scripts/detekt-test.gradle")
+apply(from = "$rootDir/scripts/android.gradle")
+apply(from = "$rootDir/scripts/detekt-test.gradle")
 
 tasks.withType<KotlinCompile>().configureEach {
     compilerOptions {
@@ -15,7 +15,7 @@ tasks.withType<KotlinCompile>().configureEach {
                 "-progressive",
                 "-Xexplicit-api=strict",
                 "-opt-in=io.getstream.chat.android.core.internal.InternalStreamChatApi",
-            )
+            ),
         )
     }
 }

diff --git a/stream-chat-android-client/build.gradle.kts b/stream-chat-android-client/build.gradle.kts
@@ -11,13 +11,13 @@ plugins {
 }
 
 rootProject.extra.apply {
-   set("PUBLISH_GROUP_ID", Configuration.artifactGroup)
-   set("PUBLISH_ARTIFACT_ID", "stream-chat-android-client")
-   set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
+    set("PUBLISH_GROUP_ID", Configuration.artifactGroup)
+    set("PUBLISH_ARTIFACT_ID", "stream-chat-android-client")
+    set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
 }
 
-apply(from = "${rootDir}/scripts/publish-module.gradle")
-apply(from = "${rootDir}/scripts/android.gradle")
+apply(from = "$rootDir/scripts/publish-module.gradle")
+apply(from = "$rootDir/scripts/android.gradle")
 
 android {
     namespace = "io.getstream.chat.android.client"
@@ -48,7 +48,6 @@ android {
 
     resourcePrefix = "stream_"
 
-
     lint {
         xmlReport = false
     }
@@ -73,7 +72,7 @@ tasks.withType<KotlinCompile>().configureEach {
                 "-Xexplicit-api=strict",
                 "-opt-in=kotlin.RequiresOptIn",
                 "-opt-in=io.getstream.chat.android.core.internal.InternalStreamChatApi",
-            )
+            ),
         )
         jvmTarget.set(JvmTarget.JVM_11)
     }

diff --git a/stream-chat-android-compose-sample/build.gradle.kts b/stream-chat-android-compose-sample/build.gradle.kts
@@ -12,8 +12,8 @@ plugins {
     alias(libs.plugins.google.services)
 }
 
-apply(from = "${rootDir}/scripts/android.gradle")
-apply(from = "${rootDir}/scripts/detekt-compose.gradle")
+apply(from = "$rootDir/scripts/android.gradle")
+apply(from = "$rootDir/scripts/detekt-compose.gradle")
 
 android {
     namespace = "io.getstream.chat.android.compose.sample"
@@ -116,7 +116,7 @@ androidComponents {
     beforeVariants { variantBuilder ->
         if (variantBuilder.buildType != "debug" &&
             variantBuilder.productFlavors.any { it.second.contains("e2e") }
-            ) {
+        ) {
             variantBuilder.enable = false
         }
     }
@@ -125,8 +125,8 @@ androidComponents {
 tasks.withType<KotlinCompile> {
     compilerOptions.freeCompilerArgs.addAll(
         listOf(
-                "-opt-in=kotlin.RequiresOptIn",
-        )
+            "-opt-in=kotlin.RequiresOptIn",
+        ),
     )
 }
 

diff --git a/stream-chat-android-compose/build.gradle.kts b/stream-chat-android-compose/build.gradle.kts
@@ -17,9 +17,9 @@ rootProject.extra.apply {
     set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
 }
 
-apply(from = "${rootDir}/scripts/publish-module.gradle")
-apply(from = "${rootDir}/scripts/android.gradle")
-apply(from = "${rootDir}/scripts/detekt-compose.gradle")
+apply(from = "$rootDir/scripts/publish-module.gradle")
+apply(from = "$rootDir/scripts/android.gradle")
+apply(from = "$rootDir/scripts/detekt-compose.gradle")
 
 android {
     namespace = "io.getstream.chat.android.compose"
@@ -66,7 +66,7 @@ tasks.withType<KotlinCompile> {
             "-opt-in=io.getstream.chat.android.core.internal.InternalStreamChatApi",
             "-opt-in=io.getstream.chat.android.core.ExperimentalStreamChatApi",
             "-opt-in=kotlin.RequiresOptIn",
-        )
+        ),
     )
 }
 

diff --git a/stream-chat-android-core/build.gradle.kts b/stream-chat-android-core/build.gradle.kts
@@ -14,16 +14,16 @@ rootProject.extra.apply {
     set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
 }
 
-apply(from = "${rootDir}/scripts/publish-module.gradle")
+apply(from = "$rootDir/scripts/publish-module.gradle")
 java {
     sourceCompatibility = JavaVersion.VERSION_11
     targetCompatibility = JavaVersion.VERSION_11
     withSourcesJar()
 }
 
-// test {
-//     useJUnitPlatform()
-// }
+tasks.withType<Test>() {
+    useJUnitPlatform()
+}
 
 tasks.withType<KotlinCompile>().configureEach {
     compilerOptions {
@@ -33,7 +33,7 @@ tasks.withType<KotlinCompile>().configureEach {
                 "-Xexplicit-api=strict",
                 "-opt-in=kotlin.RequiresOptIn",
                 "-opt-in=io.getstream.chat.android.core.internal.InternalStreamChatApi",
-            )
+            ),
         )
         jvmTarget.set(JvmTarget.JVM_11)
     }

diff --git a/stream-chat-android-e2e-test/build.gradle.kts b/stream-chat-android-e2e-test/build.gradle.kts
@@ -5,16 +5,16 @@ plugins {
     alias(libs.plugins.kotlin.android)
 }
 
-apply(from = "${rootDir}/scripts/android.gradle")
-apply(from = "${rootDir}/scripts/detekt-test.gradle")
+apply(from = "$rootDir/scripts/android.gradle")
+apply(from = "$rootDir/scripts/detekt-test.gradle")
 
 tasks.withType<KotlinCompile> {
     compilerOptions.freeCompilerArgs.addAll(
         listOf(
             "-progressive",
             "-Xexplicit-api=strict",
             "-opt-in=io.getstream.chat.android.core.internal.InternalStreamChatApi",
-        )
+        ),
     )
 }
 

diff --git a/stream-chat-android-markdown-transformer/build.gradle.kts b/stream-chat-android-markdown-transformer/build.gradle.kts
@@ -13,8 +13,8 @@ rootProject.extra.apply {
     set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
 }
 
-apply(from = "${rootDir}/scripts/publish-module.gradle")
-apply(from = "${rootDir}/scripts/android.gradle")
+apply(from = "$rootDir/scripts/publish-module.gradle")
+apply(from = "$rootDir/scripts/android.gradle")
 
 android {
     namespace = "io.getstream.chat.android.ui.markdown"
@@ -30,7 +30,7 @@ tasks.withType<KotlinCompile> {
         listOf(
             "-Xexplicit-api=strict",
             "-opt-in=io.getstream.chat.android.core.internal.InternalStreamChatApi",
-        )
+        ),
     )
 }
 

diff --git a/stream-chat-android-offline/build.gradle.kts b/stream-chat-android-offline/build.gradle.kts
@@ -18,8 +18,8 @@ rootProject.extra.apply {
     set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
 }
 
-apply(from = "${rootDir}/scripts/publish-module.gradle")
-apply(from = "${rootDir}/scripts/android.gradle")
+apply(from = "$rootDir/scripts/publish-module.gradle")
+apply(from = "$rootDir/scripts/android.gradle")
 
 android {
     namespace = "io.getstream.chat.android.offline"
@@ -75,7 +75,7 @@ tasks.withType<KotlinCompile>().configureEach {
                 "-Xexplicit-api=strict",
                 "-opt-in=kotlin.RequiresOptIn",
                 "-opt-in=io.getstream.chat.android.core.internal.InternalStreamChatApi",
-            )
+            ),
         )
         jvmTarget.set(JvmTarget.JVM_11)
     }
@@ -125,12 +125,10 @@ dependencies {
     testImplementation(libs.androidx.test.core)
     testImplementation(libs.androidx.test.junit)
     testImplementation(libs.androidx.core.testing)
-    testImplementation(libs.androidx.recyclerview)// for performance test
+    testImplementation(libs.androidx.recyclerview) // for performance test
     testImplementation(libs.androidx.room.testing)
     testImplementation(libs.androidx.work.testing)
 
-
-
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.robolectric)
     testImplementation(libs.kluent)

diff --git a/stream-chat-android-state/build.gradle.kts b/stream-chat-android-state/build.gradle.kts
@@ -1,4 +1,5 @@
 import io.getstream.chat.android.Configuration
+import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -14,8 +15,8 @@ rootProject.extra.apply {
     set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
 }
 
-apply(from = "${rootDir}/scripts/publish-module.gradle")
-apply(from = "${rootDir}/scripts/android.gradle")
+apply(from = "$rootDir/scripts/publish-module.gradle")
+apply(from = "$rootDir/scripts/android.gradle")
 
 android {
     namespace = "io.getstream.chat.android.state"
@@ -27,20 +28,19 @@ android {
 
     testOptions {
         unitTests {
-            // includeAndroidResources = true
-            // unitTests.returnDefaultValues = true
-            // Show the result of every unit test, even if it passes.
-            // all {
-            //     it.testLogging {
-            //         events = setOf(
-            //             TestLogEvent.PASSED,
-            //             TestLogEvent.SKIPPED,
-            //             TestLogEvent.FAILED,
-            //             TestLogEvent.STANDARD_OUT,
-            //             TestLogEvent.STANDARD_ERROR,
-            //         )
-            //     }
-            // }
+            isIncludeAndroidResources = true
+            unitTests.isReturnDefaultValues = true
+            all {
+                it.testLogging {
+                    events = setOf(
+                        TestLogEvent.PASSED,
+                        TestLogEvent.SKIPPED,
+                        TestLogEvent.FAILED,
+                        TestLogEvent.STANDARD_OUT,
+                        TestLogEvent.STANDARD_ERROR,
+                    )
+                }
+            }
         }
     }
 
@@ -61,10 +61,10 @@ baselineProfile {
 tasks.withType<KotlinCompile> {
     compilerOptions.freeCompilerArgs.addAll(
         listOf(
-                "-progressive",
-                "-Xexplicit-api=strict",
-                "-opt-in=io.getstream.chat.android.core.internal.InternalStreamChatApi"
-        )
+            "-progressive",
+            "-Xexplicit-api=strict",
+            "-opt-in=io.getstream.chat.android.core.internal.InternalStreamChatApi",
+        ),
     )
 }
 

diff --git a/stream-chat-android-test/build.gradle.kts b/stream-chat-android-test/build.gradle.kts
@@ -4,8 +4,8 @@ plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
 }
-apply(from = "${rootDir}/scripts/android.gradle")
-apply(from = "${rootDir}/scripts/detekt-test.gradle")
+apply(from = "$rootDir/scripts/android.gradle")
+apply(from = "$rootDir/scripts/detekt-test.gradle")
 
 android {
     namespace = "io.getstream.chat.android.test"
@@ -14,10 +14,10 @@ android {
 tasks.withType<KotlinCompile> {
     compilerOptions.freeCompilerArgs.addAll(
         listOf(
-                "-progressive",
-                "-Xexplicit-api=strict",
-                "-opt-in=io.getstream.chat.android.core.internal.InternalStreamChatApi",
-        )
+            "-progressive",
+            "-Xexplicit-api=strict",
+            "-opt-in=io.getstream.chat.android.core.internal.InternalStreamChatApi",
+        ),
     )
 }
 

diff --git a/stream-chat-android-ui-common/build.gradle.kts b/stream-chat-android-ui-common/build.gradle.kts
@@ -1,4 +1,5 @@
 import io.getstream.chat.android.Configuration
+import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -15,8 +16,8 @@ rootProject.extra.apply {
     set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
 }
 
-apply(from = "${rootDir}/scripts/publish-module.gradle")
-apply(from = "${rootDir}/scripts/android.gradle")
+apply(from = "$rootDir/scripts/publish-module.gradle")
+apply(from = "$rootDir/scripts/android.gradle")
 
 android {
     namespace = "io.getstream.chat.android.ui.common"
@@ -29,20 +30,20 @@ android {
 
     testOptions {
         unitTests {
-            // includeAndroidResources = true
-            // unitTests.returnDefaultValues = true
+            isIncludeAndroidResources = true
+            unitTests.isReturnDefaultValues = true
             // // Show the result of every unit test, even if it passes.
-            // all {
-            //     it.testLogging {
-            //         events = setOf(
-            //                 TestLogEvent.PASSED,
-            //                 TestLogEvent.SKIPPED,
-            //                 TestLogEvent.FAILED,
-            //                 TestLogEvent.STANDARD_OUT,
-            //                 TestLogEvent.STANDARD_ERROR,
-            //         )
-            //     }
-            // }
+            all {
+                it.testLogging {
+                    events = setOf(
+                            TestLogEvent.PASSED,
+                            TestLogEvent.SKIPPED,
+                            TestLogEvent.FAILED,
+                            TestLogEvent.STANDARD_OUT,
+                            TestLogEvent.STANDARD_ERROR,
+                    )
+                }
+            }
         }
     }
 
@@ -67,10 +68,10 @@ baselineProfile {
 tasks.withType<KotlinCompile> {
     compilerOptions.freeCompilerArgs.addAll(
         listOf(
-                "-progressive",
-                "-Xexplicit-api=strict",
-                "-opt-in=io.getstream.chat.android.core.internal.InternalStreamChatApi"
-        )
+            "-progressive",
+            "-Xexplicit-api=strict",
+            "-opt-in=io.getstream.chat.android.core.internal.InternalStreamChatApi",
+        ),
     )
 }