letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

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
parent 7cf9bd80e5 95ba130bc5
commit a23ecfca1b
10 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/maestro.yml vendored
View File

@@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@v3
- name: Assemble debug APK
run: ./gradlew assembleDebug $CI_GRADLE_ARG_PROPERTIES
- uses: mobile-dev-inc/action-maestro-cloud@v1.2.3
- uses: mobile-dev-inc/action-maestro-cloud@v1.3.1
with:
api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }}
app-file: app/build/outputs/apk/debug/app-debug.apk

3
app/build.gradle.kts
View File

@@ -112,6 +112,7 @@ android {
kotlinOptions {
jvmTarget = "1.8"
}
// Waiting for https://github.com/google/ksp/issues/37
applicationVariants.all {
kotlin.sourceSets {
@@ -151,7 +152,7 @@ dependencies {
anvil(projects.anvilcodegen)
// 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.androidx.splash)
implementation(libs.androidx.corektx)

9
gradle/libs.versions.toml
View File

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

2
libraries/ui-strings/src/main/res/values/strings.xml
View File

@@ -862,6 +862,8 @@
<string name="settings_notification_keyword_contains_dot">Keywords cannot start with \'.\'</string>
<string name="settings_notification_keyword_contains_invalid_character">Keywords cannot contain \'%s\'</string>
<string name="settings_notification_error_on_update">An error occurred when updating your notification preferences. Please try again.</string>
<string name="settings_notification_troubleshoot">Troubleshoot Notifications</string>
<string name="settings_troubleshoot_diagnostic">Troubleshooting diagnostics</string>
<string name="settings_troubleshoot_diagnostic_run_button_title">Run Tests</string>

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)
}

2
samples/minimal/build.gradle.kts
View File

@@ -54,5 +54,5 @@ dependencies {
implementation(projects.libraries.dateformatter)
implementation(projects.features.roomlist)
implementation(projects.features.login)
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2")
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.2")
}