diff --git a/README.md b/README.md index 91306fba..2476d271 100644 --- a/README.md +++ b/README.md @@ -45,8 +45,7 @@ However, larger and new features will be developed in their own branch. Code structure ============== -Starting with version 2.3.0, Transdroid is developed in Android Studio, fully integrating with the Gradle build system. -It is (since version 2.5.21) compiled against Android 12 (API level 31) and (since version 2.2.0) supporting Android ICS (API level 15) and up only. +Transdroid is (since version 2.5.23) compiled against Android 14 (API level 34) and (since version 2.5.23) supporting Android 5 (API level 21) and up only. To support lite (Transdrone, specially for the Play Store) and full (Transdroid) versions of the app, build flavours are defined in gradle, which contain version-specific resources. Dependencies are managed via JCentral et al. in the app's build.gradle file. @@ -59,7 +58,7 @@ Contributions by various others (see commit log). License ======= - Copyright 2010-2022 Eric Kok et al. + Copyright 2010-2023 Eric Kok et al. Transdroid is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/app/build.gradle b/app/build.gradle index 2a6c4e95..409b022b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 21 - targetSdkVersion 33 - versionCode 242 - versionName '2.5.22' + targetSdkVersion 34 + versionCode 243 + versionName '2.5.23' javaCompileOptions { annotationProcessorOptions { @@ -80,10 +80,10 @@ android { dependencies { // Android support - implementation 'androidx.appcompat:appcompat:1.5.1' - implementation 'androidx.preference:preference:1.2.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.preference:preference:1.2.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' - implementation 'com.google.android.material:material:1.7.0' + implementation 'com.google.android.material:material:1.10.0' // Other implementation 'org.androidannotations:androidannotations-api:4.8.0' @@ -97,9 +97,9 @@ dependencies { implementation('com.github.afollestad.material-dialogs:core:0.9.6.0@aar') { transitive = true } - implementation 'androidx.work:work-runtime:2.7.1' - implementation "androidx.lifecycle:lifecycle-viewmodel:2.5.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation 'androidx.work:work-runtime:2.9.0' + implementation "androidx.lifecycle:lifecycle-viewmodel:2.6.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2" annotationProcessor 'org.androidannotations:androidannotations:4.8.0' annotationProcessor 'org.androidannotations:ormlite:4.8.0' diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index e9caf635..6b6b4a48 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1 +1,4 @@ -dontobfuscate + +-keep class org.transdroid.core.gui.log.ErrorLogEntry { *; } +-dontwarn javax.persistence.** diff --git a/app/src/main/res/values/changelog.xml b/app/src/main/res/values/changelog.xml index 6e4f3df0..dc84055d 100644 --- a/app/src/main/res/values/changelog.xml +++ b/app/src/main/res/values/changelog.xml @@ -1,5 +1,5 @@ +Transdroid 2.5.23\n +- Updated min (Android 5) and target API for Play Store compatibility\n +- Updated dependencies and tooling\n +- qBittorrent add label and fixed updating of label\n +- Vanilla rTorrent delete with data fix\n +\n Transdroid 2.5.22\n - Re-authentication on qBittorrent for lingering connections\n - Fix background notifications not showing\n diff --git a/build.gradle b/build.gradle index 24cbe9df..25778b1b 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.1.4' } } diff --git a/gradle.properties b/gradle.properties index 0c1823c6..477c7047 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,7 @@ # Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Settings specified in this file will override any Gradle settings -# configured through the IDE. - -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html - -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx3072M +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b1159fc5..3a029079 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/latest-app.html b/latest-app.html index 1610ccfb..76f10ca6 100644 --- a/latest-app.html +++ b/latest-app.html @@ -1 +1 @@ -242|2.5.22 +243|2.5.23