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

Unverified Commit bd7b2714 authored by Arnau Mora's avatar Arnau Mora Committed by Ricki Hirner
Browse files

Upgrade AGP to 8.1.1 (bitfireAT/davx5#355) 



* Upgrade AGP to 8.1.1

Signed-off-by: default avatarArnau Mora <arnyminerz@proton.me>

* Upgrade Kotlin and dependencies

Signed-off-by: default avatarArnau Mora <arnyminerz@proton.me>

* Downgrade browser

Signed-off-by: default avatarArnau Mora <arnyminerz@proton.me>

---------

Signed-off-by: default avatarArnau Mora <arnyminerz@proton.me>
parent 273deecb

app/build.gradle

+3 −4
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ plugins { 


// Android configuration

android {

    compileSdkVersion 33

    buildToolsVersion '33.0.2'

    compileSdk 33



    defaultConfig {

        applicationId "at.bitfire.davdroid"
@@ -51,7 +50,7 @@ android { 
    composeOptions {

        // Keep this in sync with Kotlin version:

        // https://developer.android.com/jetpack/androidx/releases/compose-kotlin

        kotlinCompilerExtensionVersion = "1.4.8"

        kotlinCompilerExtensionVersion = "1.5.1"

    }



    // Java namespace for our classes (not to be confused with Android package ID)
@@ -113,7 +112,7 @@ ksp { 
}



configurations {

    all {

    configureEach {

        // exclude modules which are in conflict with system libraries

        exclude module: "commons-logging"

        exclude group: "org.json", module: "json"

build.gradle

+4 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ buildscript { 
        appIntro: '6.3.1',

        composeBom: '2023.06.01',

        hilt: '2.47',

        kotlin: '1.8.22',       // keep in sync with * app/build.gradle composeOptions.kotlinCompilerExtensionVersion

        kotlin: '1.9.0',       // keep in sync with * app/build.gradle composeOptions.kotlinCompilerExtensionVersion

                               //                   * com.google.devtools.ksp at the end of this file

        okhttp: '4.11.0',

        room: '2.5.2',
@@ -32,7 +32,7 @@ buildscript { 
    }



    dependencies {

        classpath 'com.android.tools.build:gradle:8.1.0'

        classpath 'com.android.tools.build:gradle:8.1.1'

        classpath "com.google.dagger:hilt-android-gradle-plugin:${versions.hilt}"

        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${versions.aboutLibraries}"

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
@@ -41,7 +41,7 @@ buildscript { 


plugins {

    // see https://github.com/google/ksp/releases for version numbers

    id 'com.google.devtools.ksp' version '1.8.22-1.0.11' apply false

    id 'com.google.devtools.ksp' version '1.9.0-1.0.13' apply false

}



allprojects {