Upgrade AGP to 8.1.1 (bitfireAT/davx5#355)

* Upgrade AGP to 8.1.1

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

* Upgrade Kotlin and dependencies

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

* Downgrade browser

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

---------

Signed-off-by: Arnau Mora <arnyminerz@proton.me>
This commit is contained in:
Arnau Mora 2023-08-23 12:47:35 +02:00 committed by Ricki Hirner
parent 273deecbe4
commit bd7b2714d2
No known key found for this signature in database
GPG key ID: 79A019FCAAEDD3AA
2 changed files with 7 additions and 8 deletions

View file

@ -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"

View file

@ -8,8 +8,8 @@ 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
// * com.google.devtools.ksp at the end of this file
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',
// latest Apache Commons versions that don't require Java 8 (Android 7)
@ -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 {