Skip to content

Commit 8dece8f

Browse files
committed
Update Android Gradle Plugin, Kotlin, Firebase, and other dependencies
This commit updates the following: - Android Gradle Plugin from 8.0.0 to 8.13.0 - Kotlin from 1.8.21 to 2.2.20 - `compileSdkVersion` from 33 to 36 - `minSdkVersion` from 16 to 23 - `targetSdkVersion` from 33 to 36 - `androidx.core:core-ktx` from 1.10.0 to 1.17.0 - `androidx.appcompat:appcompat` from 1.6.1 to 1.7.1 - `com.google.firebase:firebase-bom` from 31.5.0 to 34.3.0 - `com.google.gms:google-services` from 4.3.15 to 4.4.3 - `com.google.firebase:firebase-crashlytics-gradle` from 2.9.5 to 3.0.6 - `com.squareup.leakcanary` from 2.10 to 2.14 - `androidx.test:core` from 1.5.0 to 1.7.0 - `androidx.test.ext:junit` from 1.1.5 to 1.3.0 - `androidx.test:rules` from 1.5.0 to 1.7.0 - `androidx.test.espresso:espresso-core` from 3.5.1 to 3.7.0 - Gradle Wrapper from 8.1.1 to 8.14.3 Additionally, it updates the Kotlin JVM target syntax and the clean task configuration.
1 parent 1b36329 commit 8dece8f

3 files changed

Lines changed: 22 additions & 22 deletions

File tree

app/build.gradle

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
apply plugin: 'com.android.application'
24
apply plugin: 'kotlin-android'
35
apply plugin: 'com.google.gms.google-services'
@@ -8,12 +10,12 @@ def keystoreProperties = new Properties()
810
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
911

1012
android {
11-
compileSdk 33
13+
compileSdkVersion 36
1214
defaultConfig {
1315
namespace 'com.softartdev.conwaysgameoflife'
1416
applicationId "com.softartdev.conwaysgameoflife"
15-
minSdkVersion 16
16-
targetSdk 33
17+
minSdkVersion 23
18+
targetSdkVersion 36
1719
versionCode 211
1820
versionName '2.1.1'
1921
resourceConfigurations += ['en']
@@ -50,29 +52,27 @@ android {
5052
sourceCompatibility JavaVersion.VERSION_1_8
5153
targetCompatibility JavaVersion.VERSION_1_8
5254
}
53-
kotlinOptions {
54-
jvmTarget = '1.8'
55-
}
55+
kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_1_8
5656
testBuildType = project.hasProperty("testBuildType") ? project.property("testBuildType") : "debug"
5757
}
5858

5959
dependencies {
6060
implementation fileTree(dir: 'libs', include: ['*.jar'])
6161
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
62-
implementation 'androidx.core:core-ktx:1.10.0'
63-
implementation 'androidx.appcompat:appcompat:1.6.1'
62+
implementation 'androidx.core:core-ktx:1.17.0'
63+
implementation 'androidx.appcompat:appcompat:1.7.1'
6464
implementation 'com.jakewharton.timber:timber:5.0.1'
65-
implementation platform('com.google.firebase:firebase-bom:31.5.0')
65+
implementation platform('com.google.firebase:firebase-bom:34.3.0')
6666
implementation 'com.google.firebase:firebase-analytics'
6767
implementation 'com.google.firebase:firebase-crashlytics'
68-
def leak_canary_version = '2.10'
68+
def leak_canary_version = '2.14'
6969
debugImplementation "com.squareup.leakcanary:leakcanary-android-process:$leak_canary_version"
7070
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leak_canary_version"
7171
implementation "com.squareup.leakcanary:plumber-android:$leak_canary_version"
7272
testImplementation 'junit:junit:4.13.2'
73-
androidTestImplementation 'androidx.test:core:1.5.0'
74-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
75-
androidTestImplementation 'androidx.test:rules:1.5.0'
76-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
73+
androidTestImplementation 'androidx.test:core:1.7.0'
74+
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
75+
androidTestImplementation 'androidx.test:rules:1.7.0'
76+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
7777
androidTestImplementation "com.squareup.leakcanary:leakcanary-android-instrumentation:$leak_canary_version"
7878
}

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
buildscript {
2-
ext.kotlin_version = '1.8.21'
2+
ext.kotlin_version = '2.2.20'
33
repositories {
44
mavenCentral()
55
google()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:8.0.0'
8+
classpath 'com.android.tools.build:gradle:8.13.0'
99
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
10-
classpath 'com.google.gms:google-services:4.3.15'
11-
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
10+
classpath 'com.google.gms:google-services:4.4.3'
11+
classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.6'
1212
}
1313
}
1414

@@ -19,6 +19,6 @@ allprojects {
1919
}
2020
}
2121

22-
task clean(type: Delete) {
23-
delete rootProject.buildDir
22+
tasks.register('clean', Delete) {
23+
delete rootProject.layout.buildDirectory
2424
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Apr 28 01:34:31 GET 2023
1+
#Fri Sep 19 01:27:33 GET 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)