From ff4f1d4a74b0d4d9c05e1764a7d611d0b6535f1c Mon Sep 17 00:00:00 2001 From: Pygmalion69 Date: Fri, 30 Aug 2024 14:53:05 +0200 Subject: [PATCH] Framework updates --- app/build.gradle | 16 ++++++++++------ build.gradle | 2 +- gradle.properties | 1 - 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ac2ae90..121de41 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,6 +2,7 @@ apply plugin: 'com.android.application' apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'kotlin-kapt' + def enablePlayRelease = System.getenv('ENABLE_PLAY_RELEASE')?.toBoolean() ?: false def myStoreFile = System.getenv('STORE_FILE') @@ -75,6 +76,9 @@ android { abortOnError false disable 'ExpiredTargetSdkVersion', 'ExpiringTargetSdkVersion' } + buildFeatures { + buildConfig true + } configurations.configureEach { resolutionStrategy.force 'androidx.appcompat:appcompat:1.6.1' } @@ -84,7 +88,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //noinspection GradleCompatible implementation 'androidx.core:core-ktx:1.13.1' - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4" implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.recyclerview:recyclerview:1.3.2' @@ -97,7 +101,7 @@ dependencies { implementation 'com.google.code.gson:gson:2.10.1' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.room:room-runtime:2.6.1' - implementation 'androidx.test.ext:junit:1.1.5' + implementation 'androidx.test.ext:junit:1.2.1' annotationProcessor 'androidx.room:room-compiler:2.6.1' implementation "androidx.room:room-ktx:2.6.1" kapt "androidx.room:room-compiler:2.6.1" @@ -114,11 +118,11 @@ dependencies { exclude group: 'com.android.support', module: 'support-core-utils' exclude group: 'com.android.support', module: 'exifinterface' } - playImplementation 'com.google.android.gms:play-services-ads:23.1.0' - playImplementation 'com.google.android.ump:user-messaging-platform:2.2.0' + playImplementation 'com.google.android.gms:play-services-ads:23.3.0' + playImplementation 'com.google.android.ump:user-messaging-platform:3.0.0' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test:runner:1.5.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.test:runner:1.6.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' } java { diff --git a/build.gradle b/build.gradle index cc9ee92..fcbc53f 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.5.0' + classpath 'com.android.tools.build:gradle:8.5.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0" } } diff --git a/gradle.properties b/gradle.properties index e41f3cb..7860931 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,6 @@ org.gradle.jvmargs=-Xmx1536m android.useAndroidX=true android.enableJetifier=false -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=true android.nonFinalResIds=false org.gradle.configuration-cache=true