From 016a20dca8e5e7d70528f79a66874abbb4aa9b79 Mon Sep 17 00:00:00 2001 From: Herbert Reiter <4941275-moasda@users.noreply.gitlab.com> Date: Sat, 30 Aug 2025 15:35:22 +0200 Subject: [PATCH] Upgrade library dependencies --- app/build.gradle | 12 +++++------- build.gradle | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0c2d6a2..f1e76d4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,11 +28,9 @@ android { dependencies { api 'net.moasdawiki:moasdawiki-server:3.9.5' - api ('androidx.appcompat:appcompat:1.6.1') { - exclude group: 'org.jetbrains', module: 'annotations' - } - api ('androidx.preference:preference:1.2.1') { - exclude group: 'org.jetbrains', module: 'annotations' - } - compileOnly 'org.jetbrains:annotations:26.0.2' + + implementation ('androidx.appcompat:appcompat:1.7.1') + implementation ('androidx.preference:preference:1.2.1') + // Fix duplicate class error + implementation ("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.10") } diff --git a/build.gradle b/build.gradle index 444d640..6d083c0 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:8.10.1' + classpath 'com.android.tools.build:gradle:8.12.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files