Skip to content

Commit

Permalink
Update Kotlin, KSP and Compose to v2 (major) (#3540)
Browse files Browse the repository at this point in the history
* Update Kotlin, KSP and Compose to v2

* Update dependency com.jeppeman.mockposable:mockposable-gradle to v0.9

* upgrade Mockposable

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel Frett <[email protected]>
  • Loading branch information
renovate[bot] and frett authored Jul 1, 2024
1 parent e23bc1b commit f22272b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
4 changes: 1 addition & 3 deletions build-logic/src/main/kotlin/AndroidConfiguration.kt
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,7 @@ fun BaseExtension.configureFlavorDimensions(project: Project) {
// context(Project)
fun CommonExtension<*, *, *, *, *, *>.configureCompose(project: Project, enableCircuit: Boolean = false) {
buildFeatures.compose = true
composeOptions.kotlinCompilerExtensionVersion =
project.libs.findVersion("androidx-compose-compiler").get().requiredVersion
project.pluginManager.apply("org.jetbrains.kotlin.plugin.compose")

// add our base compose dependencies
project.dependencies.apply {
Expand All @@ -136,7 +135,6 @@ fun CommonExtension<*, *, *, *, *, *>.configureCompose(project: Project, enableC
project.pluginManager.apply("com.jeppeman.mockposable")
project.mockposable {
plugins = listOf("mockk")
composeCompilerPluginVersion = project.libs.findVersion("androidx-compose-compiler").get().requiredVersion
}
}

Expand Down
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ buildscript {
}

plugins {
alias libs.plugins.compose.compiler apply false
alias libs.plugins.hilt apply false
alias libs.plugins.ksp apply false
}
9 changes: 4 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[versions]
accompanist = "0.34.0"
android-gradle-plugin = "8.5.0"
androidx-compose-compiler = "1.5.14"
androidx-compose-material = "1.6.8"
androidx-compose-ui = "1.6.8"
androidx-core = "1.13.1"
Expand All @@ -22,10 +21,10 @@ firebase-perf = "21.0.1"
godtoolsShared = "1.0.1"
google-auto-value = "1.11.0"
gtoSupport = "4.2.1"
kotlin = "1.9.24"
kotlin = "2.0.0"
kotlinCoroutines = "1.8.1"
kotlinKover = "0.7.6"
ksp = "1.9.24-1.0.20"
ksp = "2.0.0-1.0.22"
ktlint = "1.3.0"
ktlintGradle = "12.1.1"
lottie = "6.4.1"
Expand Down Expand Up @@ -183,7 +182,7 @@ lottie = { module = "com.airbnb.android:lottie", version.ref = "lottie" }
lottie-compose = { module = "com.airbnb.android:lottie-compose", version.ref = "lottie" }
materialComponents = "com.google.android.material:material:1.12.0"
mockk = "io.mockk:mockk:1.13.11"
mockposable = 'com.jeppeman.mockposable:mockposable-gradle:0.8'
mockposable = 'com.jeppeman.mockposable:mockposable-gradle:0.9'
okhttp3 = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp3" }
okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp3" }
onesky-gradlePlugin = "co.brainly:plugin:1.6.0"
Expand Down Expand Up @@ -216,7 +215,6 @@ weakdelegate = "com.github.Karumi:WeakDelegate:1.0.1"
youtubePlayer = "com.pierfrancescosoffritti.androidyoutubeplayer:core:12.1.0"

# HACK: dependencies used to trigger renovate upgrades
androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "androidx-compose-compiler" }
ktlint = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint" }

[bundles]
Expand All @@ -229,6 +227,7 @@ ktlint-rulesets = ["ktlint-rules-compose"]
test-framework = ["junit", "kotlin-test", "androidx-test-junit", "mockk", "robolectric"]

[plugins]
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
firebase-appdistribution = { id = "com.google.firebase.appdistribution", version = "5.0.0" }
firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.2" }
firebase-perf = { id = "com.google.firebase.firebase-perf", version = "1.4.2" }
Expand Down

0 comments on commit f22272b

Please sign in to comment.