Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
# Java class files
*.class

# Kotlin files
.kotlin/

# Generated files
bin/
gen/
Expand Down
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ plugins {
id(libs.plugins.wire.hilt.get().pluginId)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.ksp)
alias(libs.plugins.compose.compiler)

id(libs.plugins.aboutLibraries.get().pluginId)

Expand Down
4 changes: 4 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ buildscript {

allprojects {
repositories {
// temporary repo containing mockative 3.0.1 with a fix for a bug https://github.com/mockative/mockative/issues/143
// until mockative releases a new version with a proper fix
maven(url = "https://raw.githubusercontent.com/saleniuk/mockative/fix/duplicates-while-merging-dex-archives-mvn/release")
google()
mavenCentral()
maven(url = "https://jitpack.io")
Expand All @@ -54,5 +57,6 @@ allprojects {
plugins {
id(ScriptPlugins.infrastructure)
alias(libs.plugins.ksp) apply false // https://github.com/google/dagger/issues/3965
alias(libs.plugins.compose.compiler) apply false
}

1 change: 1 addition & 0 deletions core/analytics-disabled/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id(libs.plugins.wire.android.library.get().pluginId)
id(libs.plugins.wire.kover.get().pluginId)
alias(libs.plugins.compose.compiler)
}

dependencies {
Expand Down
1 change: 1 addition & 0 deletions core/analytics-enabled/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id(libs.plugins.wire.android.library.get().pluginId)
id(libs.plugins.wire.kover.get().pluginId)
alias(libs.plugins.compose.compiler)
}

dependencies {
Expand Down
1 change: 1 addition & 0 deletions core/analytics/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id(libs.plugins.wire.android.library.get().pluginId)
id(libs.plugins.wire.kover.get().pluginId)
alias(libs.plugins.compose.compiler)
}

dependencies {
Expand Down
1 change: 1 addition & 0 deletions core/navigation/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id(libs.plugins.wire.android.library.get().pluginId)
id(libs.plugins.wire.kover.get().pluginId)
alias(libs.plugins.compose.compiler)
}

android {
Expand Down
1 change: 1 addition & 0 deletions core/ui-common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ plugins {
id(libs.plugins.wire.kover.get().pluginId)
alias(libs.plugins.kotlin.serialization)
id(BuildPlugins.junit5)
alias(libs.plugins.compose.compiler)
}

android {
Expand Down
1 change: 1 addition & 0 deletions features/cells/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ plugins {
id(BuildPlugins.junit5)
alias(libs.plugins.ksp)
id(libs.plugins.wire.android.navigation.get().pluginId)
alias(libs.plugins.compose.compiler)
}

dependencies {
Expand Down
1 change: 1 addition & 0 deletions features/sketch/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {
id(BuildPlugins.junit5)
alias(libs.plugins.ksp)
id(libs.plugins.wire.android.navigation.get().pluginId)
alias(libs.plugins.compose.compiler)
}

dependencies {
Expand Down
1 change: 1 addition & 0 deletions features/template/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id(libs.plugins.wire.android.library.get().pluginId)
id(libs.plugins.wire.kover.get().pluginId)
alias(libs.plugins.compose.compiler)
}

dependencies {
Expand Down
9 changes: 5 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ gradle = "8.8"

# Kotlin
grgitCore = "5.2.2"
kotlin = "1.9.23"
kotlin = "2.1.0"

# KotlinX
coroutines = "1.9.0"
Expand All @@ -17,7 +17,7 @@ ktx-serialization = "1.6.3"
detekt = "1.23.6"
google-gms = "4.4.2"
gms-location = "21.3.0"
android-gradlePlugin = "8.5.2"
android-gradlePlugin = "8.6.0"
desugaring = "2.1.3"
firebaseBOM = "33.6.0"
fragment = "1.5.6"
Expand Down Expand Up @@ -59,7 +59,7 @@ screenshot = "0.0.1-alpha08"
compose-edgetoedge-preview = "0.3.0" # update after changing target sdk to 35 and androidx-core to 1.15.0

# Hilt
hilt = "2.51.1"
hilt = "2.53"
hilt-composeNavigation = "1.2.0"
hilt-work = "1.2.0"

Expand Down Expand Up @@ -88,7 +88,7 @@ openIdAppAuth = "0.11.1"
# Other Tools
aboutLibraries = "11.1.4"
leakCanary = "2.14"
ksp = "1.9.23-1.0.20"
ksp = "2.1.0-1.0.28"

# Benchmark
benchmark-macro-junit4 = "1.3.3"
Expand Down Expand Up @@ -121,6 +121,7 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
aboutLibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutLibraries" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
screenshot = { id = "com.android.compose.screenshot", version.ref = "screenshot"}
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

# Home-made convention plugins defined in build-logic
wire-android-application = { id = "com.wire.android.application" }
Expand Down
2 changes: 1 addition & 1 deletion kalium
Submodule kalium updated 798 files
1 change: 1 addition & 0 deletions tests/testsCore/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id(libs.plugins.wire.android.test.library.get().pluginId)
alias(libs.plugins.compose.compiler)
}

android {
Expand Down
1 change: 1 addition & 0 deletions tests/testsSupport/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id(libs.plugins.wire.android.test.library.get().pluginId)
alias(libs.plugins.compose.compiler)
}

dependencies {
Expand Down
Loading