diff --git a/app/build.gradle b/app/build.gradle index 6eeaa1a..46f6acf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,16 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.application' + id 'kotlin-android' + id 'kotlin-kapt' + id 'com.google.devtools.ksp' +} android { - compileSdkVersion 33 defaultConfig { applicationId 'org.secuso.privacyfriendly2048' minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 + compileSdk 34 versionCode 5 versionName "1.3" } @@ -18,8 +22,23 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17.toString() + } + + kotlin { + jvmToolchain(17) + } + + android.applicationVariants.configureEach { variant -> + variant.outputs.all { + def appName = "pfa-2048" + outputFileName = appName + "-${variant.name}-v${variant.versionName}.apk" + } } dataBinding { @@ -30,21 +49,21 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - testImplementation 'junit:junit:4.12' - implementation 'androidx.appcompat:appcompat:1.0.0' - implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.11.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.github.bumptech.glide:glide:4.7.1' - annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1' + implementation 'com.github.bumptech.glide:glide:4.11.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' // Backup implementation project(path: ':backup-api') - def work_version = "2.4.0" + def work_version = "2.9.0" implementation "androidx.work:work-runtime:$work_version" implementation "androidx.work:work-runtime-ktx:$work_version" androidTestImplementation "androidx.work:work-testing:$work_version" - implementation 'androidx.sqlite:sqlite-ktx:2.3.1' + implementation 'androidx.sqlite:sqlite-ktx:2.4.0' constraints { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") { diff --git a/app/src/main/java/org/secuso/privacyfriendly2048/PF2048.kt b/app/src/main/java/org/secuso/privacyfriendly2048/PF2048.kt index 60bc4fa..82bf185 100644 --- a/app/src/main/java/org/secuso/privacyfriendly2048/PF2048.kt +++ b/app/src/main/java/org/secuso/privacyfriendly2048/PF2048.kt @@ -17,11 +17,7 @@ package org.secuso.privacyfriendly2048 import android.app.Application -import android.app.NotificationChannel -import android.app.NotificationManager -import android.os.Build import android.util.Log -import androidx.appcompat.app.AppCompatDelegate import androidx.work.Configuration import org.secuso.privacyfriendly2048.backup.BackupCreator import org.secuso.privacyfriendly2048.backup.BackupRestorer @@ -34,7 +30,5 @@ class PF2048 : Application(), Configuration.Provider { super.onCreate() } - override fun getWorkManagerConfiguration(): Configuration { - return Configuration.Builder().setMinimumLoggingLevel(Log.INFO).build() - } + override val workManagerConfiguration = Configuration.Builder().setMinimumLoggingLevel(Log.INFO).build() } diff --git a/build.gradle b/build.gradle index 1e0c9c9..f369406 100644 --- a/build.gradle +++ b/build.gradle @@ -2,13 +2,13 @@ buildscript { repositories { - jcenter() + mavenCentral() google() } - ext.kotlin_version = "1.7.20" + ext.kotlin_version = "1.9.10" dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.1.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -16,9 +16,13 @@ buildscript { } } +plugins { + id 'com.google.devtools.ksp' version "$kotlin_version-1.0.13" apply false +} + allprojects { repositories { - jcenter() + mavenCentral() google() } }