Skip to content

Commit 7248274

Browse files
easyhoooneasyhooon
authored
Merge pull request #264 from YAPP-Github/BOOK-494-chore/#258
chore: AGP 9.0.0 마이그레이션
2 parents ba73f80 + 8648d95 commit 7248274

41 files changed

Lines changed: 52 additions & 120 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/build.gradle.kts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
@file:Suppress("INLINE_FROM_HIGHER_PLATFORM")
2-
31
import com.google.devtools.ksp.gradle.KspExtension
42
import com.ninecraft.booket.convention.getLocalProperty
53
import org.gradle.kotlin.dsl.configure

‎build-logic/build.gradle.kts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
@Suppress("DSL_SCOPE_VIOLATION", "INLINE_FROM_HIGHER_PLATFORM")
2-
31
plugins {
42
`kotlin-dsl`
53
alias(libs.plugins.gradle.dependency.handler.extensions)
64
}
75

86
dependencies {
97
compileOnly(libs.android.gradle.plugin)
10-
compileOnly(libs.kotlin.gradle.plugin)
118
compileOnly(libs.compose.compiler.gradle.plugin)
129
compileOnly(libs.ksp.gradle.plugin)
1310
implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import com.android.build.api.dsl.ApplicationExtension
2-
import com.ninecraft.booket.convention.ApplicationConstants
32
import com.ninecraft.booket.convention.Plugins
43
import com.ninecraft.booket.convention.applyPlugins
54
import com.ninecraft.booket.convention.configureAndroid
@@ -11,10 +10,7 @@ import org.gradle.kotlin.dsl.configure
1110
internal class AndroidApplicationConventionPlugin : Plugin<Project> {
1211
override fun apply(target: Project) {
1312
with(target) {
14-
applyPlugins(
15-
Plugins.ANDROID_APPLICATION,
16-
Plugins.KOTLIN_ANDROID,
17-
)
13+
applyPlugins(Plugins.ANDROID_APPLICATION)
1814

1915
extensions.configure<ApplicationExtension> {
2016
configureAndroid(this)

‎build-logic/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import com.android.build.gradle.LibraryExtension
1+
import com.android.build.api.dsl.LibraryExtension
22
import com.ninecraft.booket.convention.Plugins
33
import com.ninecraft.booket.convention.applyPlugins
44
import com.ninecraft.booket.convention.configureCompose

‎build-logic/src/main/kotlin/AndroidLibraryConventionPlugin.kt‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,18 @@
1-
import com.android.build.gradle.LibraryExtension
1+
import com.android.build.api.dsl.LibraryExtension
22
import com.ninecraft.booket.convention.Plugins
33
import com.ninecraft.booket.convention.applyPlugins
44
import com.ninecraft.booket.convention.configureAndroid
5-
import com.ninecraft.booket.convention.libs
65
import org.gradle.api.Plugin
76
import org.gradle.api.Project
87
import org.gradle.kotlin.dsl.configure
98

109
internal class AndroidLibraryConventionPlugin : Plugin<Project> {
1110
override fun apply(target: Project) {
1211
with(target) {
13-
applyPlugins(
14-
Plugins.ANDROID_LIBRARY,
15-
Plugins.KOTLIN_ANDROID,
16-
)
12+
applyPlugins(Plugins.ANDROID_LIBRARY)
1713

1814
extensions.configure<LibraryExtension> {
1915
configureAndroid(this)
20-
21-
defaultConfig.apply {
22-
targetSdk = libs.versions.targetSdk.get().toInt()
23-
}
2416
}
2517
}
2618
}

‎build-logic/src/main/kotlin/AndroidRetrofitConventionPlugin.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
import com.android.build.gradle.LibraryExtension
2-
import com.ninecraft.booket.convention.ApplicationConstants
3-
import com.ninecraft.booket.convention.Plugins
41
import com.ninecraft.booket.convention.applyPlugins
5-
import com.ninecraft.booket.convention.configureAndroid
62
import com.ninecraft.booket.convention.implementation
73
import com.ninecraft.booket.convention.libs
84
import org.gradle.api.Plugin
95
import org.gradle.api.Project
10-
import org.gradle.kotlin.dsl.configure
116
import org.gradle.kotlin.dsl.dependencies
127

138
internal class AndroidRetrofitConventionPlugin : Plugin<Project> {

‎build-logic/src/main/kotlin/com/ninecraft/booket/convention/Android.kt‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,26 @@ package com.ninecraft.booket.convention
22

33
import com.android.build.api.dsl.CommonExtension
44
import org.gradle.api.Project
5-
import org.gradle.kotlin.dsl.configure
5+
import org.gradle.kotlin.dsl.withType
66
import org.gradle.kotlin.dsl.dependencies
7-
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
7+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
8+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
89

9-
internal fun Project.configureAndroid(extension: CommonExtension<*, *, *, *, *, *>) {
10+
internal fun Project.configureAndroid(extension: CommonExtension) {
1011
extension.apply {
1112
compileSdk = libs.versions.compileSdk.get().toInt()
1213

13-
defaultConfig {
14+
defaultConfig.apply {
1415
minSdk = libs.versions.minSdk.get().toInt()
1516
}
1617

17-
compileOptions {
18+
compileOptions.apply {
1819
sourceCompatibility = ApplicationConstants.javaVersion
1920
targetCompatibility = ApplicationConstants.javaVersion
2021
}
2122

22-
extensions.configure<KotlinProjectExtension> {
23-
jvmToolchain(ApplicationConstants.JAVA_VERSION_INT)
23+
tasks.withType<KotlinCompile>().configureEach {
24+
compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
2425
}
2526

2627
dependencies {

‎build-logic/src/main/kotlin/com/ninecraft/booket/convention/Compose.kt‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,34 @@ import org.gradle.api.Project
55
import org.gradle.kotlin.dsl.configure
66
import org.gradle.kotlin.dsl.dependencies
77
import org.gradle.kotlin.dsl.withType
8-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
98
import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
9+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1010

11-
internal fun Project.configureCompose(
12-
extension: CommonExtension<*, *, *, *, *, *>,
13-
) {
11+
internal fun Project.configureCompose(extension: CommonExtension) {
1412
extension.apply {
1513
dependencies {
1614
implementation(platform(libs.androidx.compose.bom))
1715
implementation(libs.bundles.androidx.compose)
1816
debugImplementation(libs.androidx.compose.ui.tooling)
1917
}
18+
}
2019

21-
configure<ComposeCompilerGradlePluginExtension> {
22-
includeSourceInformation.set(true)
20+
extensions.configure<ComposeCompilerGradlePluginExtension> {
21+
includeSourceInformation.set(true)
2322

24-
metricsDestination.file("build/composeMetrics")
25-
reportsDestination.file("build/composeReports")
23+
metricsDestination.file("build/composeMetrics")
24+
reportsDestination.file("build/composeReports")
2625

27-
stabilityConfigurationFiles.addAll(
28-
project.rootProject.layout.projectDirectory.file("stability.config.conf"),
29-
)
30-
}
26+
stabilityConfigurationFiles.addAll(
27+
project.rootProject.layout.projectDirectory.file("stability.config.conf"),
28+
)
29+
}
3130

32-
tasks.withType<KotlinCompile>().configureEach {
33-
compilerOptions {
34-
freeCompilerArgs.addAll(
35-
buildComposeMetricsParameters(),
36-
)
37-
}
31+
tasks.withType<KotlinCompile>().configureEach {
32+
compilerOptions {
33+
freeCompilerArgs.addAll(
34+
buildComposeMetricsParameters(),
35+
)
3836
}
3937
}
4038
}

‎build-logic/src/main/kotlin/com/ninecraft/booket/convention/Plugins.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ object Plugins {
44
const val JAVA_LIBRARY = "java-library"
55

66
const val KOTLIN_JVM = "org.jetbrains.kotlin.jvm"
7-
const val KOTLIN_ANDROID = "org.jetbrains.kotlin.android"
87
const val KOTLINX_SERIALIZATION = "org.jetbrains.kotlin.plugin.serialization"
98
const val KOTLIN_COMPOSE = "org.jetbrains.kotlin.plugin.compose"
109

‎build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ plugins {
77
alias(libs.plugins.kotlin.ktlint)
88
alias(libs.plugins.compose.stability.analyzer) apply false
99
alias(libs.plugins.kotlin.parcelize) apply false
10-
alias(libs.plugins.kotlin.android) apply false
1110
alias(libs.plugins.kotlin.compose) apply false
1211
alias(libs.plugins.kotlin.serialization) apply false
1312
alias(libs.plugins.android.application) apply false

0 commit comments

Comments
 (0)