Update gradle and dependencies to compile with Java 21.

This commit is contained in:
天クマ 2026-01-22 14:50:50 -03:00
commit f728ade6ff
5 changed files with 13 additions and 8 deletions

View file

@ -2,10 +2,12 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
android { android {
compileSdkVersion 32 namespace 'org.adrianvictor.geleia'
compileSdkVersion 34
defaultConfig { defaultConfig {
minSdkVersion 19 minSdk 19
targetSdk 33 targetSdk 33
versionCode 18 versionCode 18
@ -60,6 +62,7 @@ android {
includeInApk = false includeInApk = false
includeInBundle = false includeInBundle = false
} }
namespace 'org.adrianvictor.geleia'
} }
dependencies { dependencies {
@ -105,7 +108,7 @@ dependencies {
implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0' implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
annotationProcessor 'androidx.room:room-compiler:2.4.3' annotationProcessor 'androidx.room:room-compiler:2.4.3'
implementation 'androidx.room:room-runtime:2.4.3' implementation 'androidx.room:room-runtime:2.4.3'

View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools">
package="org.adrianvictor.geleia">
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

View file

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.2.2' classpath 'com.android.tools.build:gradle:8.3.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10'
} }

View file

@ -3,3 +3,6 @@ org.gradle.daemon=true
org.gradle.parallel=true org.gradle.parallel=true
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false

View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip