Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 19bfc1ba authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #8068 from wmontwe/dependency-updates

Dependency updates
parents 1bf64351 92b23a27
Loading
Loading
Loading
Loading
+40 −34
Original line number Diff line number Diff line
androidx.activity:activity-compose:1.8.2
androidx.activity:activity-ktx:1.8.2
androidx.activity:activity:1.8.2
androidx.activity:activity-compose:1.9.1
androidx.activity:activity-ktx:1.9.1
androidx.activity:activity:1.9.1
androidx.annotation:annotation-experimental:1.4.0
androidx.annotation:annotation-jvm:1.8.0
androidx.annotation:annotation:1.8.0
androidx.appcompat:appcompat-resources:1.6.1
androidx.appcompat:appcompat:1.6.1
androidx.annotation:annotation-jvm:1.8.2
androidx.annotation:annotation:1.8.2
androidx.appcompat:appcompat-resources:1.7.0
androidx.appcompat:appcompat:1.7.0
androidx.arch.core:core-common:2.2.0
androidx.arch.core:core-runtime:2.2.0
androidx.autofill:autofill:1.0.0
@@ -66,26 +66,32 @@ androidx.dynamicanimation:dynamicanimation:1.0.0
androidx.emoji2:emoji2-views-helper:1.3.0
androidx.emoji2:emoji2:1.3.0
androidx.exifinterface:exifinterface:1.3.6
androidx.fragment:fragment-compose:1.8.0
androidx.fragment:fragment-ktx:1.8.0
androidx.fragment:fragment:1.8.0
androidx.fragment:fragment-compose:1.8.2
androidx.fragment:fragment-ktx:1.8.2
androidx.fragment:fragment:1.8.2
androidx.interpolator:interpolator:1.0.0
androidx.legacy:legacy-support-core-utils:1.0.0
androidx.lifecycle:lifecycle-common-java8:2.7.0
androidx.lifecycle:lifecycle-common:2.7.0
androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0
androidx.lifecycle:lifecycle-livedata-core:2.7.0
androidx.lifecycle:lifecycle-livedata-ktx:2.7.0
androidx.lifecycle:lifecycle-livedata:2.7.0
androidx.lifecycle:lifecycle-process:2.7.0
androidx.lifecycle:lifecycle-runtime-compose:2.7.0
androidx.lifecycle:lifecycle-runtime-ktx:2.7.0
androidx.lifecycle:lifecycle-runtime:2.7.0
androidx.lifecycle:lifecycle-service:2.7.0
androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0
androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0
androidx.lifecycle:lifecycle-viewmodel:2.7.0
androidx.lifecycle:lifecycle-common-java8:2.8.4
androidx.lifecycle:lifecycle-common-jvm:2.8.4
androidx.lifecycle:lifecycle-common:2.8.4
androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.4
androidx.lifecycle:lifecycle-livedata-core:2.8.4
androidx.lifecycle:lifecycle-livedata-ktx:2.8.4
androidx.lifecycle:lifecycle-livedata:2.8.4
androidx.lifecycle:lifecycle-process:2.8.4
androidx.lifecycle:lifecycle-runtime-android:2.8.4
androidx.lifecycle:lifecycle-runtime-compose-android:2.8.4
androidx.lifecycle:lifecycle-runtime-compose:2.8.4
androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.4
androidx.lifecycle:lifecycle-runtime-ktx:2.8.4
androidx.lifecycle:lifecycle-runtime:2.8.4
androidx.lifecycle:lifecycle-service:2.8.4
androidx.lifecycle:lifecycle-viewmodel-android:2.8.4
androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.4
androidx.lifecycle:lifecycle-viewmodel-compose:2.8.4
androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.4
androidx.lifecycle:lifecycle-viewmodel:2.8.4
androidx.loader:loader:1.0.0
androidx.localbroadcastmanager:localbroadcastmanager:1.1.0
androidx.navigation:navigation-common-ktx:2.7.7
@@ -118,7 +124,7 @@ androidx.versionedparcelable:versionedparcelable:1.1.1
androidx.viewpager2:viewpager2:1.1.0-beta02
androidx.viewpager:viewpager:1.0.0
androidx.window:window:1.0.0
androidx.work:work-runtime:2.9.0
androidx.work:work-runtime:2.9.1
co.touchlab:stately-concurrency-jvm:2.0.6
co.touchlab:stately-concurrency:2.0.6
co.touchlab:stately-concurrent-collections-jvm:2.0.6
@@ -174,13 +180,13 @@ org.apache.httpcomponents.core5:httpcore5:5.2.4
org.apache.james:apache-mime4j-core:0.8.9
org.apache.james:apache-mime4j-dom:0.8.9
org.jetbrains.compose.runtime:runtime:1.5.12
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.0
org.jetbrains.kotlin:kotlin-bom:2.0.0
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.0
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.0
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.0
org.jetbrains.kotlin:kotlin-stdlib:2.0.0
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.10
org.jetbrains.kotlin:kotlin-bom:2.0.10
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.10
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.10
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.10
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.10
org.jetbrains.kotlin:kotlin-stdlib:2.0.10
org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.7
org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1
@@ -189,7 +195,7 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.0
org.jetbrains.kotlinx:kotlinx-datetime:0.6.0
org.jetbrains:annotations:24.0.1
org.jetbrains:annotations:24.1.0
org.jsoup:jsoup:1.17.2
org.minidns:minidns-client:1.0.5
org.minidns:minidns-core:1.0.5
+40 −34
Original line number Diff line number Diff line
androidx.activity:activity-compose:1.8.2
androidx.activity:activity-ktx:1.8.2
androidx.activity:activity:1.8.2
androidx.activity:activity-compose:1.9.1
androidx.activity:activity-ktx:1.9.1
androidx.activity:activity:1.9.1
androidx.annotation:annotation-experimental:1.4.0
androidx.annotation:annotation-jvm:1.8.0
androidx.annotation:annotation:1.8.0
androidx.appcompat:appcompat-resources:1.6.1
androidx.appcompat:appcompat:1.6.1
androidx.annotation:annotation-jvm:1.8.2
androidx.annotation:annotation:1.8.2
androidx.appcompat:appcompat-resources:1.7.0
androidx.appcompat:appcompat:1.7.0
androidx.arch.core:core-common:2.2.0
androidx.arch.core:core-runtime:2.2.0
androidx.autofill:autofill:1.0.0
@@ -66,26 +66,32 @@ androidx.dynamicanimation:dynamicanimation:1.0.0
androidx.emoji2:emoji2-views-helper:1.3.0
androidx.emoji2:emoji2:1.3.0
androidx.exifinterface:exifinterface:1.3.6
androidx.fragment:fragment-compose:1.8.0
androidx.fragment:fragment-ktx:1.8.0
androidx.fragment:fragment:1.8.0
androidx.fragment:fragment-compose:1.8.2
androidx.fragment:fragment-ktx:1.8.2
androidx.fragment:fragment:1.8.2
androidx.interpolator:interpolator:1.0.0
androidx.legacy:legacy-support-core-utils:1.0.0
androidx.lifecycle:lifecycle-common-java8:2.7.0
androidx.lifecycle:lifecycle-common:2.7.0
androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0
androidx.lifecycle:lifecycle-livedata-core:2.7.0
androidx.lifecycle:lifecycle-livedata-ktx:2.7.0
androidx.lifecycle:lifecycle-livedata:2.7.0
androidx.lifecycle:lifecycle-process:2.7.0
androidx.lifecycle:lifecycle-runtime-compose:2.7.0
androidx.lifecycle:lifecycle-runtime-ktx:2.7.0
androidx.lifecycle:lifecycle-runtime:2.7.0
androidx.lifecycle:lifecycle-service:2.7.0
androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0
androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0
androidx.lifecycle:lifecycle-viewmodel:2.7.0
androidx.lifecycle:lifecycle-common-java8:2.8.4
androidx.lifecycle:lifecycle-common-jvm:2.8.4
androidx.lifecycle:lifecycle-common:2.8.4
androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.4
androidx.lifecycle:lifecycle-livedata-core:2.8.4
androidx.lifecycle:lifecycle-livedata-ktx:2.8.4
androidx.lifecycle:lifecycle-livedata:2.8.4
androidx.lifecycle:lifecycle-process:2.8.4
androidx.lifecycle:lifecycle-runtime-android:2.8.4
androidx.lifecycle:lifecycle-runtime-compose-android:2.8.4
androidx.lifecycle:lifecycle-runtime-compose:2.8.4
androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.4
androidx.lifecycle:lifecycle-runtime-ktx:2.8.4
androidx.lifecycle:lifecycle-runtime:2.8.4
androidx.lifecycle:lifecycle-service:2.8.4
androidx.lifecycle:lifecycle-viewmodel-android:2.8.4
androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.4
androidx.lifecycle:lifecycle-viewmodel-compose:2.8.4
androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.4
androidx.lifecycle:lifecycle-viewmodel:2.8.4
androidx.loader:loader:1.0.0
androidx.localbroadcastmanager:localbroadcastmanager:1.1.0
androidx.navigation:navigation-common-ktx:2.7.7
@@ -118,7 +124,7 @@ androidx.versionedparcelable:versionedparcelable:1.1.1
androidx.viewpager2:viewpager2:1.1.0-beta02
androidx.viewpager:viewpager:1.0.0
androidx.window:window:1.0.0
androidx.work:work-runtime:2.9.0
androidx.work:work-runtime:2.9.1
co.touchlab:stately-concurrency-jvm:2.0.6
co.touchlab:stately-concurrency:2.0.6
co.touchlab:stately-concurrent-collections-jvm:2.0.6
@@ -174,13 +180,13 @@ org.apache.httpcomponents.core5:httpcore5:5.2.4
org.apache.james:apache-mime4j-core:0.8.9
org.apache.james:apache-mime4j-dom:0.8.9
org.jetbrains.compose.runtime:runtime:1.5.12
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.0
org.jetbrains.kotlin:kotlin-bom:2.0.0
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.0
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.0
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.0
org.jetbrains.kotlin:kotlin-stdlib:2.0.0
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.10
org.jetbrains.kotlin:kotlin-bom:2.0.10
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.10
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.10
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.10
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.10
org.jetbrains.kotlin:kotlin-stdlib:2.0.10
org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.7
org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1
@@ -189,7 +195,7 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.0
org.jetbrains.kotlinx:kotlinx-datetime:0.6.0
org.jetbrains:annotations:24.0.1
org.jetbrains:annotations:24.1.0
org.jsoup:jsoup:1.17.2
org.minidns:minidns-client:1.0.5
org.minidns:minidns-core:1.0.5
+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ import com.android.build.api.dsl.CommonExtension
import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.api.artifacts.dsl.DependencyHandler

internal fun CommonExtension<*, *, *, *, *>.configureSharedConfig() {
internal fun CommonExtension<*, *, *, *, *, *>.configureSharedConfig() {
    compileSdk = ThunderbirdProjectConfig.androidSdkCompile

    defaultConfig {
@@ -46,7 +46,7 @@ internal fun CommonExtension<*, *, *, *, *>.configureSharedConfig() {
    }
}

internal fun CommonExtension<*, *, *, *, *>.configureSharedComposeConfig(libs: LibrariesForLibs) {
internal fun CommonExtension<*, *, *, *, *, *>.configureSharedComposeConfig(libs: LibrariesForLibs) {
    buildFeatures {
        compose = true
    }
+21 −21
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@
androidDesugar = "2.0.4"
androidMaterial = "1.12.0"
# AGP and tools should be updated together
androidGradlePlugin = "8.2.2"
androidTools = "31.2.2"
androidxActivity = "1.8.2"
androidxAnnotation = "1.8.0"
androidxAppCompat = "1.6.1"
androidGradlePlugin = "8.5.2"
androidTools = "31.5.2"
androidxActivity = "1.9.1"
androidxAnnotation = "1.8.2"
androidxAppCompat = "1.7.0"
androidxBiometric = "1.1.0"
# https://developer.android.com/jetpack/compose/bom/bom-mapping
androidxComposeBom = "2024.06.00"
@@ -27,19 +27,19 @@ androidxCoordinatorLayout = "1.2.0"
androidxCore = "1.13.1"
androidxCoreSplashscreen = "1.0.1"
androidxDrawerLayout = "1.1.1"
androidxFragment = "1.8.0"
androidxLifecycle = "2.7.0"
androidxFragment = "1.8.2"
androidxLifecycle = "2.8.4"
androidxLocalBroadcastManager = "1.1.0"
androidxNavigation = "2.7.7"
androidxRecyclerView = "1.3.2"
androidxPreference = "1.2.1"
androidxSwiperefreshlayout = "1.1.0"
androidxTestCore = "1.5.0"
androidxTestEspresso = "3.5.1"
androidxTestExt = "1.1.5"
androidxTestRules = "1.5.0"
androidxTestRunner = "1.5.2"
androidxWork = "2.9.0"
androidxTestCore = "1.6.1"
androidxTestEspresso = "3.6.1"
androidxTestExt = "1.2.1"
androidxTestRules = "1.6.1"
androidxTestRunner = "1.6.2"
androidxWork = "2.9.1"
apacheHttpclient5 = "5.3.1"
appAuth = "0.11.1"
assertk = "0.28.1"
@@ -52,14 +52,14 @@ dependencyGuardPlugin = "0.5.0"
detektPlugin = "1.23.5"
detektPluginCompose = "0.3.21"
fastAdapter = "5.7.0"
forkhandlesBom = "2.18.0.1"
forkhandlesBom = "2.20.0.0"
glide = "4.16.0"
gradle = "8.8"
http4kBom = "5.20.0.0"
gradle = "8.10"
http4kBom = "5.27.0.0"
icu4j = "72.1"
javaDiffUtils = "4.12"
jcipAnnotations = "1.0"
jetbrainsAnnotations = "24.0.1"
jetbrainsAnnotations = "24.1.0"
jdom = "2.0.6.1"
jmapClient = "0.3.1"
jsoup = "1.17.2"
@@ -67,11 +67,11 @@ junit = "4.13.2"
jutf7 = "1.0.0"
jzlib = "1.0.7"
koinBom = "3.5.6"
kotlinBom = "2.0.0"
kotlinBom = "2.0.10"
# Needs to match the version used by Gradle, just check with `./gradlew --version`
kotlinGradleBom = "1.9.22"
kotlinGradleBom = "1.9.24"
kotlinxCoroutines = "1.8.1"
kotlinKsp = "2.0.0-1.0.22"
kotlinKsp = "2.0.10-1.0.24"
kotlinxDateTime = "0.6.0"
ktlint = "1.1.1"
kxml2 = "1.0"
@@ -80,7 +80,7 @@ materialDrawer = "9.0.2"
mime4j = "0.8.9"
minidns = "1.0.5"
mockito = "5.12.0"
mockitoKotlin = "5.3.1"
mockitoKotlin = "5.4.0"
moshi = "1.15.1"
okhttp = "4.12.0"
okio = "3.9.0"
+130 B (42.6 KiB)

File changed.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

Loading