Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Merge pull request #93 from vector-im/feature/bma/upgradeAgp

Browse source 
Upgrade AGP, and some other plugins.
This commit is contained in:
Benoit Marty 2023-02-27 11:58:20 +01:00 • committed by GitHub
commit badfa7634e
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle.kts
View file

@ -120,7 +120,7 @@ android {
compose = true compose = true
} }
composeOptions { composeOptions {
kotlinCompilerExtensionVersion = "1.4.0" kotlinCompilerExtensionVersion = libs.versions.composecompiler.get()
} }
packagingOptions { packagingOptions {
resources { resources {
@ -167,7 +167,7 @@ dependencies {
anvil(projects.anvilcodegen) anvil(projects.anvilcodegen)
// https://developer.android.com/studio/write/java8-support#library-desugaring-versions // https://developer.android.com/studio/write/java8-support#library-desugaring-versions
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2") coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.2")
implementation(libs.appyx.core) implementation(libs.appyx.core)
implementation(libs.androidx.splash) implementation(libs.androidx.splash)
implementation(libs.androidx.corektx) implementation(libs.androidx.corektx)

9
gradle/libs.versions.toml
View file

@ -3,10 +3,10 @@
[versions] [versions]
# Project # Project
android_gradle_plugin = "7.3.1" android_gradle_plugin = "7.4.1"
firebase_gradle_plugin = "3.0.2" firebase_gradle_plugin = "3.2.0"
kotlin = "1.8.0" kotlin = "1.8.10"
ksp = "1.8.0-1.0.8" ksp = "1.8.10-1.0.9"
molecule = "0.7.0" molecule = "0.7.0"
# AndroidX # AndroidX
@ -21,6 +21,7 @@ startup = "1.1.1"
# Compose # Compose
compose_bom = "2023.01.00" compose_bom = "2023.01.00"
composecompiler = "1.4.2"
# Coroutines # Coroutines
coroutines = "1.6.4" coroutines = "1.6.4"

2
plugins/src/main/kotlin/extension/CommonExtension.kt
View file

@ -50,7 +50,7 @@ fun CommonExtension<*, *, *, *>.composeConfig() {
} }
composeOptions { composeOptions {
kotlinCompilerExtensionVersion = "1.4.0" kotlinCompilerExtensionVersion = "1.4.2" // libs.versions.composecompiler.get()
} }
packagingOptions { packagingOptions {

7
plugins/src/main/kotlin/extension/DependencyHandleScope.kt
View file

@ -16,9 +16,9 @@
package extension package extension
import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.androidTestImplementation import gradle.kotlin.dsl.accessors._c662f48c4c26c34521d1054f12b949ab.androidTestImplementation
import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.debugImplementation import gradle.kotlin.dsl.accessors._c662f48c4c26c34521d1054f12b949ab.debugImplementation
import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.implementation import gradle.kotlin.dsl.accessors._c662f48c4c26c34521d1054f12b949ab.implementation
import org.gradle.kotlin.dsl.DependencyHandlerScope import org.gradle.kotlin.dsl.DependencyHandlerScope
import org.gradle.kotlin.dsl.project import org.gradle.kotlin.dsl.project
@ -33,6 +33,7 @@ fun DependencyHandlerScope.commonDependencies() {
* Dependencies used by all the modules with composable items * Dependencies used by all the modules with composable items
*/ */
fun DependencyHandlerScope.composeDependencies() { fun DependencyHandlerScope.composeDependencies() {
// TODO Find a way to use androidx_compose_bom
val composeBom = platform("androidx.compose:compose-bom:2023.01.00") val composeBom = platform("androidx.compose:compose-bom:2023.01.00")
implementation(composeBom) implementation(composeBom)
androidTestImplementation(composeBom) androidTestImplementation(composeBom)