Sulkta-Coop/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/fga/update_rust_sdk and allow using 'libs' from precompiled script

Browse source
This commit is contained in:
ganfra 2023-02-27 14:03:31 +01:00
commit c729616ce6
10 changed files with 32 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/build.gradle.kts
View file

@ -28,4 +28,5 @@ dependencies {
implementation(libs.android.gradle.plugin)
implementation(libs.kotlin.gradle.plugin)
implementation(libs.firebase.gradle.plugin)
implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
}

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

@ -21,6 +21,7 @@ import com.android.build.api.dsl.CommonExtension
import org.gradle.api.JavaVersion
import org.gradle.api.Project
import java.io.File
import org.gradle.accessors.dm.LibrariesForLibs
fun CommonExtension<*, *, *, *>.androidConfig(project: Project) {
defaultConfig {
@ -47,13 +48,14 @@ fun CommonExtension<*, *, *, *>.androidConfig(project: Project) {
}
}
fun CommonExtension<*, *, *, *>.composeConfig() {
fun CommonExtension<*, *, *, *>.composeConfig(libs: LibrariesForLibs) {
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.4.0"
kotlinCompilerExtensionVersion = libs.versions.composecompiler.get()
}
packagingOptions {

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

@ -16,9 +16,10 @@
package extension
import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.androidTestImplementation
import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.debugImplementation
import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.implementation
import gradle.kotlin.dsl.accessors._c662f48c4c26c34521d1054f12b949ab.androidTestImplementation
import gradle.kotlin.dsl.accessors._c662f48c4c26c34521d1054f12b949ab.debugImplementation
import gradle.kotlin.dsl.accessors._c662f48c4c26c34521d1054f12b949ab.implementation
import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.kotlin.dsl.DependencyHandlerScope
import org.gradle.kotlin.dsl.project
@ -32,8 +33,8 @@ fun DependencyHandlerScope.commonDependencies() {
/**
* Dependencies used by all the modules with composable items
*/
fun DependencyHandlerScope.composeDependencies() {
val composeBom = platform("androidx.compose:compose-bom:2023.01.00")
fun DependencyHandlerScope.composeDependencies(libs: LibrariesForLibs) {
val composeBom = platform(libs.androidx.compose.bom)
implementation(composeBom)
androidTestImplementation(composeBom)
implementation("androidx.compose.ui:ui")

7
plugins/src/main/kotlin/io.element.android-compose-application.gradle.kts
View file

@ -21,6 +21,9 @@ import extension.androidConfig
import extension.commonDependencies
import extension.composeConfig
import extension.composeDependencies
import org.gradle.accessors.dm.LibrariesForLibs
val libs = the<LibrariesForLibs>()
plugins {
id("com.android.application")
@ -29,10 +32,10 @@ plugins {
android {
androidConfig(project)
composeConfig()
composeConfig(libs)
}
dependencies {
commonDependencies()
composeDependencies()
composeDependencies(libs)
}

7
plugins/src/main/kotlin/io.element.android-compose-library.gradle.kts
View file

@ -21,6 +21,9 @@ import extension.androidConfig
import extension.commonDependencies
import extension.composeConfig
import extension.composeDependencies
import org.gradle.accessors.dm.LibrariesForLibs
val libs = the<LibrariesForLibs>()
plugins {
id("com.android.library")
@ -29,7 +32,7 @@ plugins {
android {
androidConfig(project)
composeConfig()
composeConfig(libs)
// Waiting for https://github.com/google/ksp/issues/37
libraryVariants.all {
kotlin.sourceSets {
@ -42,5 +45,5 @@ android {
dependencies {
commonDependencies()
composeDependencies()
composeDependencies(libs)
}