Skip to content

Commit

Permalink
changes after rebasing from develop which contains version catalog an…
Browse files Browse the repository at this point in the history
…d kts refactoring
  • Loading branch information
andremion committed Jan 2, 2025
1 parent ba78516 commit 54a6e54
Show file tree
Hide file tree
Showing 10 changed files with 56 additions and 56 deletions.
8 changes: 8 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,14 @@ apiValidation {
"stream-chat-android-test",
"stream-chat-android-compose-sample",
"stream-chat-android-ui-guides",
"stream-chat-android-client-metrics-baseline",
"stream-chat-android-client-metrics-stream",
"stream-chat-android-offline-metrics-baseline",
"stream-chat-android-offline-metrics-stream",
"stream-chat-android-ui-components-metrics-baseline",
"stream-chat-android-ui-components-metrics-stream",
"stream-chat-android-compose-metrics-baseline",
"stream-chat-android-compose-metrics-stream",
)

nonPublicMarkers += listOf(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import io.getstream.chat.android.Dependencies

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
Expand All @@ -17,8 +15,8 @@ android {
}

dependencies {
detektPlugins(Dependencies.detektFormatting)
detektPlugins(libs.detekt.formatting)

implementation(Dependencies.coroutinesCore)
implementation(Dependencies.androidxAppCompat)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.androidx.appcompat)
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import io.getstream.chat.android.Dependencies

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
Expand All @@ -17,10 +15,10 @@ android {
}

dependencies {
detektPlugins(Dependencies.detektFormatting)
detektPlugins(libs.detekt.formatting)

implementation(Dependencies.coroutinesCore)
implementation(Dependencies.androidxAppCompat)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.androidx.appcompat)

implementation(project(":stream-chat-android-client"))
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import io.getstream.chat.android.Dependencies

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
Expand All @@ -19,17 +17,17 @@ android {
}

dependencies {
detektPlugins(Dependencies.detektFormatting)
detektPlugins(libs.detekt.formatting)

implementation(Dependencies.composeUi)
implementation(Dependencies.composeUiTooling)
implementation(Dependencies.composeFoundation)
implementation(Dependencies.composeMaterial)
implementation(Dependencies.composeMaterialIcons)
implementation(libs.androidx.compose.ui)
implementation(libs.androidx.compose.ui.tooling)
implementation(libs.androidx.compose.foundation)
implementation(libs.androidx.compose.material)
implementation(libs.androidx.compose.material.icons.core)

implementation(Dependencies.composeActivity)
implementation(Dependencies.composeAndroidLifecycle)
implementation(Dependencies.composeViewModel)
implementation(Dependencies.composeAccompanistPermissions)
implementation(Dependencies.composeAccompanistPager)
implementation(libs.androidx.activity.compose)
implementation(libs.androidx.lifecycle.runtime.compose)
implementation(libs.androidx.lifecycle.viewmodel.compose)
implementation(libs.google.accompanist.permissions)
implementation(libs.google.accompanist.pager)
}
24 changes: 11 additions & 13 deletions metrics/stream-chat-android-compose-metrics-stream/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import io.getstream.chat.android.Dependencies

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
Expand All @@ -19,19 +17,19 @@ android {
}

dependencies {
detektPlugins(Dependencies.detektFormatting)
detektPlugins(libs.detekt.formatting)

implementation(Dependencies.composeUi)
implementation(Dependencies.composeUiTooling)
implementation(Dependencies.composeFoundation)
implementation(Dependencies.composeMaterial)
implementation(Dependencies.composeMaterialIcons)
implementation(libs.androidx.compose.ui)
implementation(libs.androidx.compose.ui.tooling)
implementation(libs.androidx.compose.foundation)
implementation(libs.androidx.compose.material)
implementation(libs.androidx.compose.material.icons.core)

implementation(Dependencies.composeActivity)
implementation(Dependencies.composeAndroidLifecycle)
implementation(Dependencies.composeViewModel)
implementation(Dependencies.composeAccompanistPermissions)
implementation(Dependencies.composeAccompanistPager)
implementation(libs.androidx.activity.compose)
implementation(libs.androidx.lifecycle.runtime.compose)
implementation(libs.androidx.lifecycle.viewmodel.compose)
implementation(libs.google.accompanist.permissions)
implementation(libs.google.accompanist.pager)

implementation(project(":stream-chat-android-compose"))
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import io.getstream.chat.android.Dependencies

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
Expand All @@ -17,8 +15,8 @@ android {
}

dependencies {
detektPlugins(Dependencies.detektFormatting)
detektPlugins(libs.detekt.formatting)

implementation(Dependencies.coroutinesCore)
implementation(Dependencies.androidxAppCompat)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.androidx.appcompat)
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import io.getstream.chat.android.Dependencies

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
Expand All @@ -17,10 +15,10 @@ android {
}

dependencies {
detektPlugins(Dependencies.detektFormatting)
detektPlugins(libs.detekt.formatting)

implementation(Dependencies.coroutinesCore)
implementation(Dependencies.androidxAppCompat)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.androidx.appcompat)

implementation(project(":stream-chat-android-offline"))
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import io.getstream.chat.android.Dependencies

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
Expand All @@ -17,8 +15,8 @@ android {
}

dependencies {
detektPlugins(Dependencies.detektFormatting)
detektPlugins(libs.detekt.formatting)

implementation(Dependencies.coroutinesCore)
implementation(Dependencies.androidxAppCompat)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.androidx.appcompat)
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import io.getstream.chat.android.Dependencies

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
Expand All @@ -17,10 +15,10 @@ android {
}

dependencies {
detektPlugins(Dependencies.detektFormatting)
detektPlugins(libs.detekt.formatting)

implementation(Dependencies.coroutinesCore)
implementation(Dependencies.androidxAppCompat)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.androidx.appcompat)

implementation(project(":stream-chat-android-ui-components"))
}
8 changes: 8 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@ include (
":stream-chat-android-ui-uitests",
":stream-chat-android-benchmark",
":stream-chat-android-ai-assistant",
":metrics:stream-chat-android-client-metrics-baseline",
":metrics:stream-chat-android-client-metrics-stream",
":metrics:stream-chat-android-offline-metrics-baseline",
":metrics:stream-chat-android-offline-metrics-stream",
":metrics:stream-chat-android-ui-components-metrics-baseline",
":metrics:stream-chat-android-ui-components-metrics-stream",
":metrics:stream-chat-android-compose-metrics-baseline",
":metrics:stream-chat-android-compose-metrics-stream",
)

dependencyResolutionManagement {
Expand Down

0 comments on commit 54a6e54

Please sign in to comment.