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

Commit f2f40049 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Update Kotlin, dependencies, Gradle

parent 7a259383
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -56,7 +56,7 @@ android {
    composeOptions {
    composeOptions {
        // Keep this in sync with Kotlin version:
        // Keep this in sync with Kotlin version:
        // https://developer.android.com/jetpack/androidx/releases/compose-kotlin
        // https://developer.android.com/jetpack/androidx/releases/compose-kotlin
        kotlinCompilerExtensionVersion = "1.5.5"
        kotlinCompilerExtensionVersion = "1.5.6"
    }
    }


    // Java namespace for our classes (not to be confused with Android package ID)
    // Java namespace for our classes (not to be confused with Android package ID)
@@ -193,7 +193,7 @@ dependencies {
    implementation 'commons-io:commons-io:2.8.0'
    implementation 'commons-io:commons-io:2.8.0'
    //noinspection GradleDependency - dnsjava 3.x requires Android 8 [https://github.com/bitfireAT/davx5/issues/453]
    //noinspection GradleDependency - dnsjava 3.x requires Android 8 [https://github.com/bitfireAT/davx5/issues/453]
    implementation 'dnsjava:dnsjava:2.1.9'
    implementation 'dnsjava:dnsjava:2.1.9'
    implementation 'io.github.nsk90:kstatemachine-jvm:0.23.0'
    implementation 'io.github.nsk90:kstatemachine-jvm:0.24.0'
    implementation 'net.openid:appauth:0.11.1'
    implementation 'net.openid:appauth:0.11.1'
    implementation "org.apache.commons:commons-collections4:${versions.commonsCollections}"
    implementation "org.apache.commons:commons-collections4:${versions.commonsCollections}"
    implementation "org.apache.commons:commons-lang3:${versions.commonsLang}"
    implementation "org.apache.commons:commons-lang3:${versions.commonsLang}"
+3 −3
Original line number Original line Diff line number Diff line
@@ -9,14 +9,14 @@ buildscript {
        appIntro: '7.0.0-beta02',
        appIntro: '7.0.0-beta02',
        composeBom: '2023.10.01',
        composeBom: '2023.10.01',
        hilt: '2.49',
        hilt: '2.49',
        kotlin: '1.9.20', // keep in sync with * app/build.gradle composeOptions.kotlinCompilerExtensionVersion
        kotlin: '1.9.21', // keep in sync with * app/build.gradle composeOptions.kotlinCompilerExtensionVersion
                          //                   * com.google.devtools.ksp at the end of this file
                          //                   * com.google.devtools.ksp at the end of this file
        okhttp: '4.12.0',
        okhttp: '4.12.0',
        room: '2.6.1',
        room: '2.6.1',
        workManager: '2.9.0',
        workManager: '2.9.0',
        // Apache Commons versions
        // Apache Commons versions
        commonsCollections: '4.4',
        commonsCollections: '4.4',
        commonsLang: '3.13.0',
        commonsLang: '3.14.0',
        commonsText: '1.11.0',
        commonsText: '1.11.0',
        // own libraries
        // own libraries
        cert4android: '2bb3898',
        cert4android: '2bb3898',
@@ -43,7 +43,7 @@ buildscript {


plugins {
plugins {
    // see https://github.com/google/ksp/releases for version numbers
    // see https://github.com/google/ksp/releases for version numbers
    id 'com.google.devtools.ksp' version '1.9.20-1.0.14' apply false
    id 'com.google.devtools.ksp' version '1.9.21-1.0.15' apply false
}
}


allprojects {
allprojects {
+1 −1
Original line number Original line Diff line number Diff line
distributionBase=GRADLE_USER_HOME
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStorePath=wrapper/dists