AGP 업그레이드 7.2.1 -> 8.7.2

BCSDLab · Nov 5, 2024 · fae30c4 · fae30c4
1 parent ffe957d
commit fae30c4
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 19 deletions.
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -3,8 +3,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {

diff --git a/build-logic/convention/src/main/java/in/koreatech/convention/AndroidCompose.kt b/build-logic/convention/src/main/java/in/koreatech/convention/AndroidCompose.kt
@@ -6,7 +6,7 @@ import org.gradle.kotlin.dsl.dependencies
 
 
 internal fun Project.configureAndroidCompose(
-    commonExtension: CommonExtension<*, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         buildFeatures.compose = true

diff --git a/build-logic/convention/src/main/java/in/koreatech/convention/AndroidLibrary.kt b/build-logic/convention/src/main/java/in/koreatech/convention/AndroidLibrary.kt
@@ -6,7 +6,7 @@ import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 
 internal fun Project.configureAndroidLibrary(
-    commonExtension: CommonExtension<*, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     (commonExtension as? LibraryExtension)?.let {
         it.defaultConfig.targetSdk = 34
@@ -26,12 +26,12 @@ internal fun Project.configureAndroidLibrary(
         }
 
         compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_11
-            targetCompatibility = JavaVersion.VERSION_11
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
         }
 
         kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_11.toString()
+            jvmTarget = JavaVersion.VERSION_17.toString()
         }
 
         packagingOptions {

diff --git a/build-logic/convention/src/main/java/in/koreatech/convention/AndroidOrbit.kt b/build-logic/convention/src/main/java/in/koreatech/convention/AndroidOrbit.kt
@@ -5,7 +5,7 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
 
 internal fun Project.configureAndroidOrbit(
-    commonExtension: CommonExtension<*, *, *, *>
+    commonExtension: CommonExtension<*, *, *, *, *, *>
 ){
     dependencies {
         implementation(libs.findBundle("orbit").get())

diff --git a/build-logic/convention/src/main/java/in/koreatech/convention/AndroidProject.kt b/build-logic/convention/src/main/java/in/koreatech/convention/AndroidProject.kt
@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 
 
 internal fun configureAndroidProject(
-    commonExtension: CommonExtension<*, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     (commonExtension as? ApplicationExtension)?.let {
         it.defaultConfig.targetSdk = 34
@@ -26,17 +26,17 @@ internal fun configureAndroidProject(
         }
 
         compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_11
-            targetCompatibility = JavaVersion.VERSION_11
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
         }
 
         kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_11.toString()
+            jvmTarget = JavaVersion.VERSION_17.toString()
         }
     }
 
 }
 
-fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
+fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
     (this as ExtensionAware).extensions.configure("kotlinOptions", block)
 }
diff --git a/build-logic/convention/src/main/java/in/koreatech/convention/KotlinAndroid.kt b/build-logic/convention/src/main/java/in/koreatech/convention/KotlinAndroid.kt
@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 
 internal fun Project.configureKotlinJvm() {
     extensions.configure<JavaPluginExtension> {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -23,6 +23,9 @@ org.gradle.daemon=true
 org.gradle.parallel=true
 # Enable configure on demand.
 org.gradle.configureondemand=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
 
 
 # When configured, Gradle will run in incubating parallel mode.

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -15,8 +15,8 @@ firebaseAppdistributionGradleVersion = "4.2.0"
 javaxInjectVersion = "1"
 jsr250ApiVersion = "1.0"
 kotlinVersion = "1.9.22"
-androidGradleVersion = "7.2.1"
-firebaseGradleVersion = "2.4.1"
+androidGradleVersion = "8.7.2"
+firebaseGradleVersion = "2.5.2"
 hiltVersion = "2.50"
 kotlinxCoroutinesAndroidVersion = "1.6.3"
 kotlinxCoroutinesCoreVersion = "1.6.3"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Mar 02 04:09:08 KST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/koin/build.gradle.kts b/koin/build.gradle.kts
@@ -79,7 +79,7 @@ android {
 
 fun getPropertyKey(propertyKey: String): String {
     val nullableProperty: String? =
-        gradleLocalProperties(rootDir).getProperty(propertyKey)
+        gradleLocalProperties(rootDir, providers).getProperty(propertyKey)
     return nullableProperty ?: "null"
 }