From b87caec787e2f458763d595f45cb50ad75188480 Mon Sep 17 00:00:00 2001 From: "Clores, Maureen Orea | Mau | MCPD" Date: Wed, 8 Oct 2025 15:05:23 +0900 Subject: [PATCH 1/5] feat: add support for building with Android 15 --- .../src/test/resources/build_script_dependency.gradle | 2 +- quality/jacoco/android.gradle | 8 ++++---- versions/versions.gradle | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/buildSrc/src/test/resources/build_script_dependency.gradle b/buildSrc/src/test/resources/build_script_dependency.gradle index a0ed56a..e9b5d13 100644 --- a/buildSrc/src/test/resources/build_script_dependency.gradle +++ b/buildSrc/src/test/resources/build_script_dependency.gradle @@ -3,6 +3,6 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.0' + classpath "com.android.tools.build:gradle:${CONFIG.versions.android.plugin}" } } \ No newline at end of file diff --git a/quality/jacoco/android.gradle b/quality/jacoco/android.gradle index f7cb193..a600226 100644 --- a/quality/jacoco/android.gradle +++ b/quality/jacoco/android.gradle @@ -30,9 +30,9 @@ def addJacocoTask(variant) { jacocoTask.description = "Generate Jacoco Report for variant $variantName" jacocoTask.reports { - csv.enabled false - html.enabled true - xml.enabled true + csv.required = false + html.required = true + xml.required = true } def excludedFiles = [ @@ -56,7 +56,7 @@ def addJacocoTask(variant) { sourceDirectories.from(files(variant.sourceSets.kotlin.srcDirs.flatten())) def kotlinTask = tasks.getByName("compile${variantName}Kotlin") if(kotlinTask) { - classDirectories += fileTree(dir: kotlinTask.destinationDir, excludes: excludedFiles) + classDirectories += fileTree(dir: kotlinTask.destinationDirectory.get(), excludes: excludedFiles) } } diff --git a/versions/versions.gradle b/versions/versions.gradle index dac84d9..abbb2e2 100644 --- a/versions/versions.gradle +++ b/versions/versions.gradle @@ -7,7 +7,7 @@ ext.CONFIG.versions = [ // Java compatibility target version java : '11', - kotlin : '1.5.21', + kotlin : '1.9.0', // Android plugins, tools, SDK and libraries android : [ @@ -16,10 +16,10 @@ ext.CONFIG.versions = [ support : '26.0.0', volley : '1.1.1', ], - plugin: '7.2.0', + plugin: '8.6.0', sdk : [ - compile: 31, - target : 31, + compile: 35, + target : 35, min : 23, ], ], From f411aea61b6c2148e7c24502ed4e554378665c9a Mon Sep 17 00:00:00 2001 From: "Clores, Maureen Orea | Mau | MCPD" Date: Wed, 3 Dec 2025 13:30:53 +0900 Subject: [PATCH 2/5] chore: update default Java version and resolve buildConfig warning --- android/android.gradle | 4 ++++ versions/versions.gradle | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/android/android.gradle b/android/android.gradle index 91e982f..b12ecf6 100644 --- a/android/android.gradle +++ b/android/android.gradle @@ -16,6 +16,10 @@ android { targetCompatibility JavaVersion.toVersion(CONFIG.versions.java) } + buildFeatures { ++ buildConfig = true ++ } + testOptions.unitTests.all { maxParallelForks 2 diff --git a/versions/versions.gradle b/versions/versions.gradle index abbb2e2..5aefc1d 100644 --- a/versions/versions.gradle +++ b/versions/versions.gradle @@ -6,7 +6,7 @@ // than the consumer applications. ext.CONFIG.versions = [ // Java compatibility target version - java : '11', + java : '17', kotlin : '1.9.0', // Android plugins, tools, SDK and libraries From 27821943b63d8fb182aa3b250c063890a92e90b9 Mon Sep 17 00:00:00 2001 From: "Clores, Maureen Orea | Mau | MCPD" Date: Wed, 3 Dec 2025 13:34:54 +0900 Subject: [PATCH 3/5] fix: buildFeatures syntax error --- android/android.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/android.gradle b/android/android.gradle index b12ecf6..f50a837 100644 --- a/android/android.gradle +++ b/android/android.gradle @@ -16,9 +16,9 @@ android { targetCompatibility JavaVersion.toVersion(CONFIG.versions.java) } - buildFeatures { -+ buildConfig = true -+ } + buildFeatures { + buildConfig = true + } testOptions.unitTests.all { maxParallelForks 2 From 7e3e77e0834d0177a78b2548532d0d2f853f2fd0 Mon Sep 17 00:00:00 2001 From: "Clores, Maureen Orea | Mau | MCPD" Date: Wed, 10 Dec 2025 11:42:02 +0900 Subject: [PATCH 4/5] fix: gradlew publish issue due to AGP upgrade --- publish/android.gradle | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/publish/android.gradle b/publish/android.gradle index 23898df..e9f29a0 100644 --- a/publish/android.gradle +++ b/publish/android.gradle @@ -1,5 +1,13 @@ apply from: "$CONFIG.configDir/publish/base-artifact.gradle" +android { + publishing { + singleVariant("release") { + withSourcesJar() + } + } +} + task androidSourceJar(type: Jar) { from android.sourceSets.main.java.srcDirs archiveClassifier = 'sources' @@ -10,9 +18,5 @@ ext.androidArtifact = { Map config -> return baseArtifact(config) << { from config.get('from') ?: components.release - - if (!config.get('excludeSourceJar')) { - artifact androidSourceJar - } } } From 9f917103d4ab61660d9efddb36bd61d4c5db0ddb Mon Sep 17 00:00:00 2001 From: puneetksh <105346684+puneetksh@users.noreply.github.com> Date: Wed, 28 Jan 2026 11:20:05 +0530 Subject: [PATCH 5/5] chore: set the KGP version '1.8.0' Co-authored-by: Puneet --- versions/versions.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/versions.gradle b/versions/versions.gradle index 5aefc1d..bf02ede 100644 --- a/versions/versions.gradle +++ b/versions/versions.gradle @@ -7,7 +7,7 @@ ext.CONFIG.versions = [ // Java compatibility target version java : '17', - kotlin : '1.9.0', + kotlin : '1.8.0', // Android plugins, tools, SDK and libraries android : [