AGP 9 Upgrade

Author: stzouvaras

analytics-logic/build.gradle.kts

@@ -14,6 +14,7 @@
  * governing permissions and limitations under the Licence.
  */
 
+import com.android.build.api.dsl.LibraryExtension
 import project.convention.logic.config.LibraryModule
 import project.convention.logic.kover.KoverExclusionRules
 import project.convention.logic.kover.excludeFromKoverReport
@@ -22,7 +23,7 @@ plugins {
     id("project.android.library")
 }
 
-android {
+extensions.configure<LibraryExtension>("android") {
     namespace = "eu.europa.ec.analyticslogic"
 }
 

app/src/main/baseline-prof.txt

@@ -14,6 +14,7 @@
  * governing permissions and limitations under the Licence.
  */
 
+import com.android.build.api.dsl.LibraryExtension
 import project.convention.logic.config.LibraryModule.AnalyticsLogic
 import project.convention.logic.config.LibraryModule.AssemblyLogic
 import project.convention.logic.config.LibraryModule.AuthenticationLogic
@@ -39,7 +40,7 @@ plugins {
     id("project.rqes.sdk")
 }
 
-android {
+extensions.configure<LibraryExtension>("android") {
     namespace = "eu.europa.ec.assemblylogic"
 
     defaultConfig {

app/src/main/startup-prof.txt

@@ -14,6 +14,7 @@
  * governing permissions and limitations under the Licence.
  */
 
+import com.android.build.api.dsl.LibraryExtension
 import project.convention.logic.config.LibraryModule
 import project.convention.logic.kover.KoverExclusionRules
 import project.convention.logic.kover.excludeFromKoverReport
@@ -22,7 +23,7 @@ plugins {
     id("project.android.library")
 }
 
-android {
+extensions.configure<LibraryExtension>("android") {
     namespace = "eu.europa.ec.authenticationlogic"
 }
 

assembly-logic/build.gradle.kts

@@ -1,3 +1,5 @@
+import com.android.build.api.dsl.TestExtension
+
 /*
  * Copyright (c) 2025 European Commission
  *
@@ -18,6 +20,6 @@ plugins {
     id("project.android.base.profile")
 }
 
-android {
+extensions.configure<TestExtension>("android") {
     namespace = "eu.europa.ec.baselineprofile"
 }

authentication-logic/build.gradle.kts

@@ -30,7 +30,6 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
         with(target) {
             with(pluginManager) {
                 apply("com.android.application")
-                apply("org.jetbrains.kotlin.android")
                 apply("project.android.application.flavors")
                 apply("project.android.koin")
                 apply("project.android.lint")

baseline-profile/build.gradle.kts

@@ -14,8 +14,8 @@
  * governing permissions and limitations under the Licence.
  */
 import androidx.baselineprofile.gradle.producer.BaselineProfileProducerExtension
+import com.android.build.api.dsl.TestExtension
 import com.android.build.api.variant.TestAndroidComponentsExtension
-import com.android.build.gradle.TestExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
@@ -31,7 +31,6 @@ class AndroidBaseLineProfilePlugin : Plugin<Project> {
         with(target) {
             with(pluginManager) {
                 apply("com.android.test")
-                apply("org.jetbrains.kotlin.android")
                 apply("androidx.baselineprofile")
             }
 

build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt

@@ -14,10 +14,9 @@
  * governing permissions and limitations under the Licence.
  */
 
-import com.android.build.gradle.LibraryExtension
+import com.android.build.api.dsl.LibraryExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 import project.convention.logic.config.LibraryModule
 import project.convention.logic.configureGradleManagedDevices
@@ -29,7 +28,7 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
                 apply("project.android.library")
                 apply("project.android.library.compose")
             }
-            extensions.configure<LibraryExtension> {
+            extensions.configure<LibraryExtension>("android") {
                 defaultConfig {
                     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                 }

build-logic/convention/src/main/kotlin/AndroidBaseLineProfilePlugin.kt

@@ -14,10 +14,9 @@
  * governing permissions and limitations under the Licence.
  */
 
-import com.android.build.gradle.LibraryExtension
+import com.android.build.api.dsl.LibraryExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 import project.convention.logic.config.LibraryModule
 import project.convention.logic.configureGradleManagedDevices
@@ -28,7 +27,7 @@ class AndroidFeatureTestConventionPlugin : Plugin<Project> {
             pluginManager.apply {
                 apply("project.android.library")
             }
-            extensions.configure<LibraryExtension> {
+            extensions.configure<LibraryExtension>("android") {
                 defaultConfig {
                     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                 }