Skip to content

Commit 4eaa764

Browse files
feat/pimob-4057: Upgrade AGP to 8.12.3
Updates the Gradle wrapper, Android Gradle Plugin, and related configurations. - Bumps Gradle wrapper from 8.2.1 to 8.13. - Upgrades Android Gradle Plugin from 8.1.2 to 8.12.3.
1 parent 69995a0 commit 4eaa764

30 files changed

Lines changed: 149 additions & 239 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
/local.properties
44
/.idea/*
55
.DS_Store
6+
.kotlin
67
/build
78
/captures
89
.externalNativeBuild

app/build.gradle

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id("com.android.application")
33
id("org.jetbrains.kotlin.android")
4+
id("org.jetbrains.kotlin.plugin.compose")
45
}
56

67
android {
@@ -15,7 +16,7 @@ android {
1516
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1617
}
1718
testOptions {
18-
execution 'ANDROIDX_TEST_ORCHESTRATOR'
19+
execution = "ANDROIDX_TEST_ORCHESTRATOR"
1920
animationsDisabled = true
2021
}
2122
signingConfigs {
@@ -34,20 +35,21 @@ android {
3435

3536
buildTypes {
3637
release {
37-
minifyEnabled true
38-
signingConfig signingConfigs.release
39-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
38+
minifyEnabled = true
39+
signingConfig = signingConfigs.release
40+
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
4041
}
4142
}
4243

4344
// Create baseline for lint check to ignore old issues.
44-
lintOptions {
45-
baseline(project.file("lint-baseline.xml"))
45+
lint {
46+
baseline = file('lint-baseline.xml')
4647
}
4748
}
4849

4950
dependencies {
5051
implementation 'androidx.activity:activity:1.8.0'
52+
implementation 'androidx.appcompat:appcompat:1.7.1'
5153
testImplementation 'junit:junit:4.13.2'
5254
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
5355
androidTestImplementation 'androidx.test:runner:1.5.2'
@@ -64,7 +66,7 @@ dependencies {
6466
implementation FramesConfig.framesAndroidDependency
6567
}
6668

67-
configurations.all {
69+
configurations.configureEach {
6870
resolutionStrategy.dependencySubstitution {
6971
if (FramesConfig.useLocalModuleDependencies) {
7072

build.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@ import com.vanniktech.code.quality.tools.CodeQualityToolsPluginExtension
22
import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
33

44
// Top-level build file where you can add configuration options common to all sub-projects/modules.
5+
plugins {
6+
id("com.google.devtools.ksp") version "2.2.20-2.0.2" apply false
7+
id("org.jetbrains.kotlin.plugin.compose") version "2.2.20" apply false
8+
}
9+
510
buildscript {
611
repositories {
712
google()
813
mavenCentral()
9-
jcenter()
1014
}
1115

1216
dependencies {
@@ -44,7 +48,7 @@ allprojects {
4448
}
4549

4650
tasks.register("clean", Delete::class) {
47-
delete(rootProject.buildDir)
51+
delete(rootProject.layout.buildDirectory)
4852
}
4953

5054
/* Code quality tools config */

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ java {
1313
}
1414

1515
dependencies {
16-
implementation("com.android.tools.build:gradle:8.1.2")
16+
implementation("com.android.tools.build:gradle:8.12.3")
1717
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.property("kotlinVersion")}")
1818
implementation("de.mannodermaus.gradle.plugins:android-junit5:${project.property("mannodermausAndroidJunit5Version")}")
1919
implementation("org.jetbrains.dokka:dokka-gradle-plugin:${project.property("dokkaVersion")}")

buildSrc/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
kotlinVersion=1.9.10
2-
gradleVersion=8.1.2
1+
kotlinVersion=2.2.20
2+
gradleVersion=8.12.3
33
mannodermausAndroidJunit5Version=1.8.0.0
44
dokkaVersion=1.9.0
55
codeQualityToolsPlugin=0.21.0

buildSrc/src/main/java/Dependencies.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ object Dependencies {
1111
"org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.kotlinCoroutines}"
1212
const val coreKtx = "androidx.core:core-ktx:${Versions.coreKtx}"
1313
const val appcompat = "androidx.appcompat:appcompat:${Versions.appcompat}"
14-
const val constraintLayout =
15-
"androidx.constraintlayout:constraintlayout:${Versions.constraintLayout}"
16-
const val materialDesign = "com.google.android.material:material:${Versions.materialDesign}"
17-
const val lifeCycleLiveData = "androidx.lifecycle:lifecycle-livedata-ktx:${Versions.lifeCycle}"
1814
const val lifeCycleRunTime = "androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifeCycle}"
1915
const val lifecycle_viewmodel =
2016
"androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.lifeCycle}"
@@ -51,8 +47,6 @@ object Dependencies {
5147

5248
// Dependency injection
5349
const val dagger = "com.google.dagger:dagger-android:${Versions.dagger}"
54-
const val dagger_support = "com.google.dagger:dagger-android-support:${Versions.dagger}"
55-
const val dagger_processor = "com.google.dagger:dagger-android-processor:${Versions.dagger}"
5650
const val dagger_compiler = "com.google.dagger:dagger-compiler:${Versions.dagger}"
5751

5852
// Instrumented Test
@@ -74,6 +68,7 @@ object Dependencies {
7468
const val junitJupiterApi = "org.junit.jupiter:junit-jupiter-api:${Versions.junit5Jupiter}"
7569
const val junitJupiterEngine =
7670
"org.junit.jupiter:junit-jupiter-engine:${Versions.junit5Jupiter}"
71+
const val junitPlatformLauncher = "org.junit.platform:junit-platform-launcher:${Versions.junitPlatformLauncher}"
7772
const val junitJupiterParams =
7873
"org.junit.jupiter:junit-jupiter-params:${Versions.junit5Jupiter}"
7974
const val mannodermausAndroidJunitCore =
@@ -88,6 +83,7 @@ object Dependencies {
8883
const val kluentAndroid = "org.amshove.kluent:kluent-android:${Versions.kluent}"
8984
const val robolectric = "org.robolectric:robolectric:${Versions.robolectric}"
9085
const val truth = "com.google.truth:truth:${Versions.truth}"
86+
const val testRunner = "androidx.test:runner:${Versions.testRunner}"
9187
const val okhttpMockServer = "com.squareup.okhttp3:mockwebserver:${Versions.okhttp}"
9288
const val kotlinCoroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.kotlinCoroutines}"
9389
const val jsonTest = "org.json:json:${Versions.jsonTest}"

buildSrc/src/main/java/Versions.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ object Versions {
1717
const val jsonTest = "20180813"
1818
const val coreKtx = "1.2.0"
1919
const val appcompat = "1.3.1"
20-
const val constraintLayout = "2.1.1"
21-
const val materialDesign = "1.4.0"
2220
const val lifeCycle = "2.5.1"
23-
const val compose_compiler_ext = "1.5.3"
2421
const val compose_material3 = "1.1.2"
2522
const val compose_version = "1.7.4"
2623
const val compose_activity_version = "1.8.0"
@@ -39,13 +36,15 @@ object Versions {
3936
const val riskSdk = "2.1.0"
4037

4138
// Unit Testing Dependencies
42-
const val junit5Jupiter = "5.8.0"
39+
const val junit5Jupiter = "5.13.4"
4340
const val junit4 = "4.13.2"
4441
const val junitVintageEngine = "5.8.2"
42+
const val junitPlatformLauncher = "1.11.4"
4543
const val kluent = "1.68"
46-
const val mockk = "1.13.8"
44+
const val mockk = "1.14.6"
4745
const val robolectric = "4.11-beta-2"
4846
const val truth = "1.1.5"
47+
const val testRunner = "1.7.0"
4948
const val jacoco = "0.8.10"
5049

5150
// Instrumented Testing Dependencies
@@ -62,7 +61,7 @@ object Versions {
6261
const val eventLogger = "1.0.1"
6362

6463
// Dependency injection
65-
const val dagger = "2.48.1"
64+
const val dagger = "2.57.2"
6665
}
6766

6867
fun loadVersionProperty(): Properties {

buildSrc/src/main/java/com/checkout/buildsrc/AndroidJunit4Config.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ fun Project.applyAndroidJUnit4Configuration() {
1010
testImplementation(Dependencies.junitVintageEngine)
1111
testImplementation(Dependencies.robolectric)
1212
testImplementation(Dependencies.truth)
13+
testImplementation(Dependencies.testRunner)
1314
}
1415
}

buildSrc/src/main/java/com/checkout/buildsrc/AndroidJunit5Config.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ private val Project.junitPlatform: AndroidJUnitPlatformExtension
4545
private fun DependencyHandler.junit5() {
4646
testImplementation(Dependencies.junitJupiterApi)
4747
testRuntimeOnly(Dependencies.junitJupiterEngine)
48+
testRuntimeOnly(Dependencies.junitPlatformLauncher)
4849
testImplementation(Dependencies.junitJupiterParams)
4950
}
5051

buildSrc/src/main/java/com/checkout/buildsrc/BaseDependencies.kt

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Dependencies
44
import com.checkout.buildsrc.utils.androidTestImplementation
55
import com.checkout.buildsrc.utils.debugImplementation
66
import com.checkout.buildsrc.utils.implementation
7-
import com.checkout.buildsrc.utils.kapt
7+
import com.checkout.buildsrc.utils.ksp
88
import com.checkout.buildsrc.utils.testImplementation
99
import org.gradle.api.artifacts.dsl.DependencyHandler
1010

@@ -19,14 +19,6 @@ fun DependencyHandler.commonDependencies() {
1919
implementation(Dependencies.appcompat)
2020
}
2121

22-
/**
23-
* Dependencies usually required for modules with a Imperative UI
24-
*/
25-
fun DependencyHandler.androidImperativeUI() {
26-
implementation(Dependencies.constraintLayout)
27-
implementation(Dependencies.materialDesign)
28-
}
29-
3022
/**
3123
* Dependencies usually required for modules with a Declarative UI
3224
*/
@@ -51,7 +43,7 @@ fun DependencyHandler.networkingDependencies() {
5143
implementation(Dependencies.okhttp)
5244
implementation(Dependencies.loggingInterceptor)
5345
implementation(Dependencies.moshi)
54-
kapt(Dependencies.moshiCodeGen)
46+
ksp(Dependencies.moshiCodeGen)
5547
}
5648

5749
fun DependencyHandler.riskSdkDependencies() {
@@ -70,9 +62,7 @@ fun DependencyHandler.logging() {
7062
*/
7163
fun DependencyHandler.dependencyInjection() {
7264
implementation(Dependencies.dagger)
73-
implementation(Dependencies.dagger_support)
74-
kapt(Dependencies.dagger_processor)
75-
kapt(Dependencies.dagger_compiler)
65+
ksp(Dependencies.dagger_compiler)
7666
}
7767

7868
/**

0 commit comments

Comments
 (0)