Kotlin 1.8 + cleanup
This commit is contained in:
committed by
Benoit Marty
parent
6e72187ff1
commit
bd93e54543
@@ -117,7 +117,7 @@ android {
|
|||||||
compose = true
|
compose = true
|
||||||
}
|
}
|
||||||
composeOptions {
|
composeOptions {
|
||||||
kotlinCompilerExtensionVersion = "1.3.2"
|
kotlinCompilerExtensionVersion = "1.4.0"
|
||||||
}
|
}
|
||||||
packagingOptions {
|
packagingOptions {
|
||||||
resources {
|
resources {
|
||||||
@@ -174,8 +174,6 @@ dependencies {
|
|||||||
|
|
||||||
// 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:1.2.2")
|
||||||
implementation(libs.compose.destinations)
|
|
||||||
ksp(libs.compose.destinations.processor)
|
|
||||||
implementation(libs.appyx.core)
|
implementation(libs.appyx.core)
|
||||||
|
|
||||||
implementation(libs.androidx.corektx)
|
implementation(libs.androidx.corektx)
|
||||||
|
|||||||
@@ -5,9 +5,9 @@
|
|||||||
# Project
|
# Project
|
||||||
android_gradle_plugin = "7.3.1"
|
android_gradle_plugin = "7.3.1"
|
||||||
firebase_gradle_plugin = "3.0.2"
|
firebase_gradle_plugin = "3.0.2"
|
||||||
kotlin = "1.7.20"
|
kotlin = "1.8.0"
|
||||||
ksp = "1.7.20-1.0.7"
|
ksp = "1.8.0-1.0.8"
|
||||||
molecule = "0.6.1"
|
molecule = "0.7.0"
|
||||||
|
|
||||||
# AndroidX
|
# AndroidX
|
||||||
material = "1.6.1"
|
material = "1.6.1"
|
||||||
@@ -20,8 +20,7 @@ activity_compose = "1.6.1"
|
|||||||
startup = "1.1.1"
|
startup = "1.1.1"
|
||||||
|
|
||||||
# Compose
|
# Compose
|
||||||
compose_compiler = "1.3.2"
|
compose_bom = "2023.01.00"
|
||||||
compose_bom = "2022.11.00"
|
|
||||||
|
|
||||||
# Coroutines
|
# Coroutines
|
||||||
coroutines = "1.6.4"
|
coroutines = "1.6.4"
|
||||||
@@ -41,12 +40,11 @@ test_hamcrest = "2.2"
|
|||||||
test_orchestrator = "1.4.1"
|
test_orchestrator = "1.4.1"
|
||||||
|
|
||||||
#other
|
#other
|
||||||
coil = "2.2.1"
|
coil = "2.2.2"
|
||||||
datetime = "0.4.0"
|
datetime = "0.4.0"
|
||||||
wysiwyg = "0.7.0.1"
|
wysiwyg = "0.7.0.1"
|
||||||
serialization_json = "1.4.1"
|
serialization_json = "1.4.1"
|
||||||
showkase = "1.0.0-beta14"
|
showkase = "1.0.0-beta14"
|
||||||
compose_destinations = "1.7.23-beta"
|
|
||||||
jsoup = "1.15.3"
|
jsoup = "1.15.3"
|
||||||
appyx = "1.0.1"
|
appyx = "1.0.1"
|
||||||
seismic = "1.0.3"
|
seismic = "1.0.3"
|
||||||
@@ -54,8 +52,8 @@ dependencycheck = "7.4.4"
|
|||||||
stem = "2.2.3"
|
stem = "2.2.3"
|
||||||
|
|
||||||
# DI
|
# DI
|
||||||
dagger = "2.43"
|
dagger = "2.44.2"
|
||||||
anvil = "2.4.2"
|
anvil = "2.4.4"
|
||||||
|
|
||||||
# quality
|
# quality
|
||||||
detekt = "1.22.0"
|
detekt = "1.22.0"
|
||||||
@@ -83,7 +81,6 @@ androidx_activity_compose = { module = "androidx.activity:activity-compose", ver
|
|||||||
androidx_startup = { module = "androidx.startup:startup-runtime", version.ref = "startup" }
|
androidx_startup = { module = "androidx.startup:startup-runtime", version.ref = "startup" }
|
||||||
|
|
||||||
androidx_compose_bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose_bom" }
|
androidx_compose_bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose_bom" }
|
||||||
androidx_compose_foundation = { group = "androidx.compose.foundation", name = "foundation" }
|
|
||||||
|
|
||||||
# Coroutines
|
# Coroutines
|
||||||
coroutines_core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
|
coroutines_core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
|
||||||
@@ -119,8 +116,6 @@ coil = { module = "io.coil-kt:coil", version.ref = "coil" }
|
|||||||
coil_compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
|
coil_compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
|
||||||
datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" }
|
datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" }
|
||||||
serialization_json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_json" }
|
serialization_json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_json" }
|
||||||
compose_destinations = { module = "io.github.raamcosta.compose-destinations:animations-core", version.ref = "compose_destinations" }
|
|
||||||
compose_destinations_processor = { module = "io.github.raamcosta.compose-destinations:ksp", version.ref = "compose_destinations" }
|
|
||||||
showkase = { module = "com.airbnb.android:showkase", version.ref = "showkase" }
|
showkase = { module = "com.airbnb.android:showkase", version.ref = "showkase" }
|
||||||
showkase_processor = { module = "com.airbnb.android:showkase-processor", version.ref = "showkase" }
|
showkase_processor = { module = "com.airbnb.android:showkase-processor", version.ref = "showkase" }
|
||||||
jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
|
jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "io.element.android.x.libraries.presentation"
|
namespace = "io.element.android.x.architecture"
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id("io.element.android-library")
|
id("io.element.android-library")
|
||||||
alias(libs.plugins.anvil)
|
alias(libs.plugins.anvil)
|
||||||
kotlin("plugin.serialization") version "1.7.20"
|
kotlin("plugin.serialization") version "1.8.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
|||||||
@@ -15,12 +15,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import org.gradle.api.JavaVersion
|
import org.gradle.api.JavaVersion
|
||||||
import org.gradle.api.artifacts.VersionCatalog
|
|
||||||
import org.gradle.jvm.toolchain.JavaLanguageVersion
|
import org.gradle.jvm.toolchain.JavaLanguageVersion
|
||||||
|
|
||||||
val VersionCatalog.composeVersion: String
|
|
||||||
get() = findVersion("compose_compiler").get().requiredVersion
|
|
||||||
|
|
||||||
object Versions {
|
object Versions {
|
||||||
const val versionCode = 100100
|
const val versionCode = 100100
|
||||||
const val versionName = "0.1.0"
|
const val versionName = "0.1.0"
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ fun CommonExtension<*, *, *, *>.composeConfig() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
composeOptions {
|
composeOptions {
|
||||||
kotlinCompilerExtensionVersion = "1.3.2"
|
kotlinCompilerExtensionVersion = "1.4.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
packagingOptions {
|
packagingOptions {
|
||||||
|
|||||||
@@ -32,7 +32,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() {
|
||||||
val composeBom = platform("androidx.compose:compose-bom:2022.11.00")
|
val composeBom = platform("androidx.compose:compose-bom:2023.01.00")
|
||||||
implementation(composeBom)
|
implementation(composeBom)
|
||||||
androidTestImplementation(composeBom)
|
androidTestImplementation(composeBom)
|
||||||
implementation("androidx.compose.ui:ui")
|
implementation("androidx.compose.ui:ui")
|
||||||
@@ -42,7 +42,6 @@ fun DependencyHandlerScope.composeDependencies() {
|
|||||||
implementation("androidx.compose.ui:ui-tooling-preview")
|
implementation("androidx.compose.ui:ui-tooling-preview")
|
||||||
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1")
|
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1")
|
||||||
implementation("androidx.activity:activity-compose:1.6.1")
|
implementation("androidx.activity:activity-compose:1.6.1")
|
||||||
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1")
|
|
||||||
debugImplementation("androidx.compose.ui:ui-tooling")
|
debugImplementation("androidx.compose.ui:ui-tooling")
|
||||||
debugImplementation("androidx.compose.ui:ui-test-manifest")
|
debugImplementation("androidx.compose.ui:ui-test-manifest")
|
||||||
implementation("com.airbnb.android:showkase:1.0.0-beta14")
|
implementation("com.airbnb.android:showkase:1.0.0-beta14")
|
||||||
|
|||||||
Reference in New Issue
Block a user