Skip to content

Commit

Permalink
For mozilla-mobile#12725: Upgrade compose to 1.2.1 version.
Browse files Browse the repository at this point in the history
Split versioning of compose compiler.
Enable Xjvm-default to allow inheriting from interfaces with '@JvmDefault' members
like AbstractComposeView, NestedScrollConnection.
  • Loading branch information
mcarare committed Sep 1, 2022
1 parent 93859d8 commit a2e7bb7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = Versions.androidx_compose
kotlinCompilerExtensionVersion = Versions.androidx_compose_compiler
}

}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ allprojects {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.allWarningsAsErrors = true
kotlinOptions.freeCompilerArgs += [
"-Xopt-in=kotlin.RequiresOptIn"
"-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=enable"
]
}
}
Expand Down
3 changes: 2 additions & 1 deletion buildSrc/src/main/java/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ object Versions {
const val detekt = "1.19.0"
const val jna = "5.8.0"

const val androidx_compose = "1.1.1"
const val androidx_compose = "1.2.1"
const val androidx_compose_compiler = "1.1.1"
const val androidx_appcompat = "1.3.0"
const val androidx_benchmark = "1.0.0"
const val androidx_biometric = "1.1.0"
Expand Down

0 comments on commit a2e7bb7

Please sign in to comment.