From a3cb8a04498773af75145af98f4e09c77246cf71 Mon Sep 17 00:00:00 2001 From: Externius Date: Wed, 6 Nov 2024 19:28:18 +0100 Subject: [PATCH] Update target sdk + dependencies --- .gitignore | 6 +++++ .idea/compiler.xml | 2 +- .idea/gradle.xml | 6 ++--- .idea/misc.xml | 3 ++- app/build.gradle | 28 ++++++++++++------------ app/src/main/AndroidManifest.xml | 2 +- build.gradle | 4 ++-- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 9 files changed, 32 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 1a756bb..47327e3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,9 @@ /build /captures .externalNativeBuild +/.idea/androidTestResultsUserPreferences.xml +/.idea/deploymentTargetDropDown.xml +/.idea/deploymentTargetSelector.xml +/.idea/migrations.xml +/.idea/runConfigurations.xml +/.idea/shelf/* diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b589d56..b86273d 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ae388c2..efacb99 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,16 +4,16 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 52ce2af..19d0550 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,3 +1,4 @@ + - + diff --git a/app/build.gradle b/app/build.gradle index 0aa62f3..434129f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,9 +5,9 @@ android { defaultConfig { applicationId "externius.rdmg" minSdkVersion 23 - targetSdk 34 - versionCode 38 - versionName '1.0.34' + targetSdk 35 + versionCode 39 + versionName '1.0.35' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" proguardFiles 'proguard-rules.pro' multiDexEnabled = false @@ -40,17 +40,17 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'androidx.annotation:annotation:1.7.0' - androidTestImplementation 'androidx.annotation:annotation:1.7.0' - androidTestImplementation 'androidx.test:runner:1.5.2' - androidTestImplementation 'androidx.test:rules:1.5.0' - androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'com.google.android.material:material:1.10.0' + implementation 'androidx.annotation:annotation:1.9.1' + androidTestImplementation 'androidx.annotation:annotation:1.9.1' + androidTestImplementation 'androidx.test:runner:1.6.2' + androidTestImplementation 'androidx.test:rules:1.6.1' + androidTestImplementation 'androidx.test.espresso:espresso-intents:3.6.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' + androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.3.0' + androidTestImplementation 'androidx.test.ext:junit:1.2.1' + implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.2.0' + implementation 'com.google.android.material:material:1.12.0' testImplementation 'junit:junit:4.13.2' implementation 'org.hamcrest:hamcrest-library:2.2' implementation 'com.google.code.gson:gson:2.10.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 12454e4..83d9973 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,7 +32,7 @@ android:parentActivityName=".activities.MainActivity" android:theme="@style/AppTheme.NoActionBar" android:screenOrientation="portrait" - tools:ignore="LockedOrientationActivity"> + tools:ignore="DiscouragedApi,LockedOrientationActivity"> diff --git a/build.gradle b/build.gradle index 218e164..25f16b7 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.android.tools.build:gradle:8.7.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -24,5 +24,5 @@ allprojects { } tasks.register('clean', Delete) { - delete rootProject.buildDir + delete rootProject.layout.buildDirectory } diff --git a/gradle.properties b/gradle.properties index fd2aae5..206db09 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -android.defaults.buildfeatures.buildconfig=true +android.defaults.buildfeatures.buildconfig=false android.enableJetifier=false android.nonFinalResIds=false android.nonTransitiveRClass=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dabbd3c..fdeb269 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Oct 14 21:50:44 CEST 2020 +#Sun Nov 03 18:49:20 CET 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip