Skip to content

Commit

Permalink
Framework updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Pygmalion69 committed Aug 30, 2024
1 parent 4967cd7 commit ff4f1d4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
16 changes: 10 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -75,6 +76,9 @@ android {
abortOnError false
disable 'ExpiredTargetSdkVersion', 'ExpiringTargetSdkVersion'
}
buildFeatures {
buildConfig true
}
configurations.configureEach {
resolutionStrategy.force 'androidx.appcompat:appcompat:1.6.1'
}
Expand All @@ -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'
Expand All @@ -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"
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit ff4f1d4

Please sign in to comment.