chore: Android Gradle Plugin 9.0.0 대응 (#1493)

l2hyunwoo · web-flow · commit cef332fc2993 · 2026-01-22T23:56:02.000+09:00
* chore: set agp version 9.0.0

* chore: agp 9.0.0 대응

- built in kotlin 사용
- ksp 빌드 경로 명시적으로 표기 안하도록 변경
- BaseExtension -&gt; CommonExtension

* chore: gradle properties 대응

- Dagger-hilt로 인해 newDsl은 다음에 대응
- configuration-cache parllel 속성 추가
- jvm heap 할당량 8기가로 추가

* chore: 추가 대응

* chore: 올리는 김에 다른 것도 올림
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -101,16 +101,6 @@ android {
             isDebuggable = false
         }
     }
-    applicationVariants.all {
-        val variant = this
-        kotlin {
-            sourceSets {
-                getByName(variant.name) {
-                    kotlin.srcDir("build/generated/ksp/${variant.name}/kotlin")
-                }
-            }
-        }
-    }
 }
 
 ksp {
diff --git a/baselineprofile/build.gradle.kts b/baselineprofile/build.gradle.kts
@@ -23,11 +23,9 @@
  * SOFTWARE.
  */
 import com.android.build.api.dsl.ManagedVirtualDevice
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.androidTest)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.androidx.baselineprofile)
 }
 
@@ -39,11 +37,7 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-
-    kotlin {
-        compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
-    }
-
+    
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
diff --git a/build-logic/convention/src/main/kotlin/org/sopt/official/plugin/AndroidApplicationPlugin.kt b/build-logic/convention/src/main/kotlin/org/sopt/official/plugin/AndroidApplicationPlugin.kt
@@ -1,6 +1,6 @@
 package org.sopt.official.plugin
 
-import com.android.build.gradle.BaseExtension
+import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.getByType
@@ -23,7 +23,7 @@ class AndroidApplicationPlugin : AndroidBasePlugin() {
         configureAndroidBase()
 
         val properties = ConfigurationManager.loadProperties(this)
-        extensions.getByType<BaseExtension>().apply {
+        extensions.getByType<CommonExtension>().apply {
             configureBuildConfigFields(properties)
         }
 
diff --git a/build-logic/convention/src/main/kotlin/org/sopt/official/plugin/AndroidComposePlugin.kt b/build-logic/convention/src/main/kotlin/org/sopt/official/plugin/AndroidComposePlugin.kt
@@ -1,6 +1,6 @@
 package org.sopt.official.plugin
 
-import com.android.build.gradle.BaseExtension
+import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.getByType
@@ -12,7 +12,7 @@ class AndroidComposePlugin : BasePlugin() {
     override fun apply(target: Project): Unit = with(target) {
         applyPlugin("org.jetbrains.kotlin.plugin.compose")
 
-        extensions.getByType<BaseExtension>().apply {
+        extensions.getByType<CommonExtension>().apply {
             buildFeatures.apply {
                 compose = true
             }
diff --git a/build-logic/convention/src/main/kotlin/org/sopt/official/plugin/AndroidFeaturePlugin.kt b/build-logic/convention/src/main/kotlin/org/sopt/official/plugin/AndroidFeaturePlugin.kt
@@ -1,6 +1,6 @@
 package org.sopt.official.plugin
 
-import com.android.build.gradle.BaseExtension
+import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.getByType
@@ -23,7 +23,7 @@ class AndroidFeaturePlugin : AndroidBasePlugin() {
         configureAndroidBase()
 
         val properties = ConfigurationManager.loadProperties(this)
-        extensions.getByType<BaseExtension>().apply {
+        extensions.getByType<CommonExtension>().apply {
             configureBuildConfigFields(properties)
         }
 
diff --git a/build-logic/convention/src/main/kotlin/org/sopt/official/plugin/AndroidKotlinPlugin.kt b/build-logic/convention/src/main/kotlin/org/sopt/official/plugin/AndroidKotlinPlugin.kt
@@ -1,22 +1,11 @@
 package org.sopt.official.plugin
 
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.getByType
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 import org.sopt.official.plugin.base.BasePlugin
 import org.sopt.official.plugin.configuration.DependencyManager.addKotlinDependencies
 
 class AndroidKotlinPlugin : BasePlugin() {
     override fun apply(target: Project) = with(target) {
-        applyPlugin("kotlin-android")
-
-        extensions.getByType<KotlinAndroidProjectExtension>().apply {
-            compilerOptions {
-                jvmTarget.set(JvmTarget.JVM_17)
-            }
-        }
-
         addKotlinDependencies(libs)
     }
 }
diff --git a/build-logic/convention/src/main/kotlin/org/sopt/official/plugin/AndroidTestPlugin.kt b/build-logic/convention/src/main/kotlin/org/sopt/official/plugin/AndroidTestPlugin.kt
@@ -1,6 +1,6 @@
 package org.sopt.official.plugin
 
-import com.android.build.gradle.BaseExtension
+import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.getByType
@@ -11,22 +11,18 @@ class AndroidTestPlugin : BasePlugin() {
     override fun apply(target: Project): Unit = with(target) {
         apply<JUnit5Plugin>()
 
-        extensions.getByType<BaseExtension>().apply {
-            defaultConfig {
+        extensions.getByType<CommonExtension>().apply {
+            defaultConfig.apply {
                 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                 testInstrumentationRunnerArguments["runnerBuilder"] =
                     "de.mannodermaus.junit5.AndroidJUnit5Builder"
             }
 
-            testOptions {
-                unitTests {
-                    isIncludeAndroidResources = true
-                }
+            testOptions.unitTests.apply {
+                isIncludeAndroidResources = true
             }
 
-            packagingOptions {
-                resources.excludes.add("META-INF/LICENSE*")
-            }
+            packaging.resources.excludes.add("META-INF/LICENSE*")
         }
 
         addTestDependencies(libs)
diff --git a/build-logic/convention/src/main/kotlin/org/sopt/official/plugin/base/AndroidBasePlugin.kt b/build-logic/convention/src/main/kotlin/org/sopt/official/plugin/base/AndroidBasePlugin.kt
@@ -1,39 +1,44 @@
 package org.sopt.official.plugin.base
 
-import com.android.build.gradle.BaseExtension
+import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.getByType
 
 abstract class AndroidBasePlugin : BasePlugin() {
 
     protected fun Project.configureAndroidBase() {
-        extensions.getByType<BaseExtension>().apply {
-            setCompileSdkVersion(libs.findVersion("compileSdk").get().requiredVersion.toInt())
+        extensions.getByType<CommonExtension>().apply {
+            compileSdk = libs.findVersion("compileSdk").get().requiredVersion.toInt()
 
-            defaultConfig {
+            defaultConfig.apply {
                 minSdk = libs.findVersion("minSdk").get().requiredVersion.toInt()
-                targetSdk = libs.findVersion("targetSdk").get().requiredVersion.toInt()
             }
 
-            compileOptions {
+            compileOptions.apply {
                 isCoreLibraryDesugaringEnabled = true
                 sourceCompatibility = JavaVersion.VERSION_17
                 targetCompatibility = JavaVersion.VERSION_17
             }
 
-            packagingOptions {
-                resources.excludes.apply {
-                    add("/META-INF/AL2.0")
-                    add("/META-INF/LGPL2.1")
-                    add("kotlin/reflect/*")
-                }
+            packaging.resources.excludes.apply {
+                add("/META-INF/AL2.0")
+                add("/META-INF/LGPL2.1")
+                add("kotlin/reflect/*")
             }
 
             buildFeatures.apply {
                 viewBinding = true
                 buildConfig = true
             }
         }
+
+        // targetSdk is only available for Application modules
+        extensions.findByType(ApplicationExtension::class.java)?.apply {
+            defaultConfig.apply {
+                targetSdk = libs.findVersion("targetSdk").get().requiredVersion.toInt()
+            }
+        }
     }
 }
diff --git a/build-logic/convention/src/main/kotlin/org/sopt/official/plugin/configuration/ConfigurationManager.kt b/build-logic/convention/src/main/kotlin/org/sopt/official/plugin/configuration/ConfigurationManager.kt
@@ -1,6 +1,6 @@
 package org.sopt.official.plugin.configuration
 
-import com.android.build.gradle.BaseExtension
+import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.Project
 import java.util.Properties
 
@@ -16,8 +16,8 @@ object ConfigurationManager {
         }
     }
 
-    fun BaseExtension.configureBuildConfigFields(properties: Properties) {
-        defaultConfig {
+    fun CommonExtension.configureBuildConfigFields(properties: Properties) {
+        defaultConfig.apply {
             // API Keys and URLs
             buildConfigField("String", "SOPTAMP_API_KEY", properties.getQuotedProperty("apiKey"))
             buildConfigField("String", "SOPTAMP_DATA_STORE_KEY", properties.getQuotedProperty("dataStoreKey"))
@@ -48,14 +48,14 @@ object ConfigurationManager {
             buildConfigField("String", "PROD_SERVER_CLIENT_ID", properties.getQuotedProperty("prodServerClientId"))
         }
 
-        buildTypes {
-            getByName("debug") {
+        buildTypes.apply {
+            getByName("debug").apply {
                 buildConfigField(
                     "String", "PLAYGROUND_API",
                     properties.getQuotedProperty("debugPlaygroundApi")
                 )
             }
-            getByName("release") {
+            getByName("release").apply {
                 buildConfigField(
                     "String", "PLAYGROUND_API",
                     properties.getQuotedProperty("releasePlaygroundApi")
diff --git a/build-logic/gradle/wrapper/gradle-wrapper.properties b/build-logic/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Jan 13 12:46:38 KST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/core/security/src/main/java/org/sopt/official/security/util/CryptoExt.kt b/core/security/src/main/java/org/sopt/official/security/util/CryptoExt.kt
@@ -51,11 +51,11 @@ fun String.getEncryptedDataOrDefault(keyAlias: String) = CryptoManager.encrypt(
     bytes = this.toByteArray(Charsets.UTF_8)
 ).mapCatching { encryptedContent ->
     encryptedContent.concatenate().toBase64()
-}.getOrDefault(this).toString()
+}.getOrDefault(this)
 
 fun String.getDecryptedDataOrDefault(keyAlias: String, initializationVectorSize: Int = 12) = CryptoManager.decrypt(
     keyAlias = keyAlias,
     encryptedContent = this.toByteArray().toEncryptedContent(initializationVectorSize = initializationVectorSize)
 ).mapCatching { decryptedContent ->
     decryptedContent.toString(Charsets.UTF_8)
-}.getOrDefault(this).toString()
+}.getOrDefault(this)
diff --git a/feature/soptamp/build.gradle.kts b/feature/soptamp/build.gradle.kts
@@ -36,13 +36,6 @@ android {
             useSupportLibrary = true
         }
     }
-    libraryVariants.all {
-        sourceSets {
-            getByName(name) {
-                java.srcDir("build/generated/ksp/$name/kotlin")
-            }
-        }
-    }
     namespace = "org.sopt.official.stamp"
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,11 +1,12 @@
 org.gradle.caching=true
 org.gradle.configuration-cache=true
+org.gradle.configuration-cache.parallel=true
 android.nonTransitiveRClass=true
 kotlin.code.style=official
 kotlin.incremental=true
 org.gradle.daemon=true
 org.gradle.parallel=true
-org.gradle.jvmargs=-Xmx4092m -Dfile.encoding\=UTF-8
+org.gradle.jvmargs=-Xmx8192m -Dfile.encoding\=UTF-8
 android.useAndroidX=true
 kotlin.incremental.usePreciseJavaTracking=true
 android.enableJetifier=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -39,16 +39,16 @@ junit5-android-test = "2.0.1"
 junit5-jupiter = "6.0.2"
 junit5-test = "2.0.0"
 truth = "1.4.5"
-robolectric = "4.16"
+robolectric = "4.16.1"
 androidx-uiautomator = "2.3.0"
 androidx-test = "1.7.0"
 androidx-test-rules = "1.7.0"
 mockk = "1.14.7"
 
-gradleplugin = "8.13.2"
+gradleplugin = "9.0.0"
 kspplugin = "2.3.4"
 
-dagger-hilt = "2.58"
+dagger-hilt = "2.59"
 dagger-hilt-navigation-compose = "1.3.0"
 okhttp = "5.3.2"
 retrofit = "3.0.0"
@@ -59,7 +59,7 @@ lottie = "6.7.1"
 dotsindicator = "5.1.0"
 deepLinkDispatch = "7.2.1"
 rin = "0.4.0"
-mozilla-component-utils = "146.0.1"
+mozilla-component-utils = "147.0"
 balloonCompose = "1.7.3"
 
 google-services = "4.4.4"
@@ -74,7 +74,7 @@ amplitude = "1.23.0"
 spotless = "8.1.0"
 constraintlayout = "2.2.1"
 benchmark-macro-junit4 = "1.4.1"
-androidx-baselineprofile = "1.4.1"
+androidx-baselineprofile = "1.5.0-alpha01"
 profileinstaller = "1.4.1"
 code-gson = "2.13.2"
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -101,16 +101,6 @@ android {`
`101`	`101`	`isDebuggable = false`
`102`	`102`	`}`
`103`	`103`	`}`
`104`		`- applicationVariants.all {`
`105`		`- val variant = this`
`106`		`- kotlin {`
`107`		`- sourceSets {`
`108`		`- getByName(variant.name) {`
`109`		`- kotlin.srcDir("build/generated/ksp/${variant.name}/kotlin")`
`110`		`- }`
`111`		`- }`
`112`		`- }`
`113`		`- }`
`114`	`104`	`}`
`115`	`105`
`116`	`106`	`ksp {`