Skip to content

Commit f693934

Browse files
authored
Merge pull request #267 from YAPP-Github/refactor/#266-composable-stability
[REFACTOR] Composable Stability 개선
2 parents b4e7807 + 1577cf0 commit f693934

File tree

19 files changed

+61
-55
lines changed

19 files changed

+61
-55
lines changed

app/build.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ plugins {
88

99
android {
1010
namespace = "com.yapp.orbit"
11-
compileSdk = 35
11+
compileSdk = libs.versions.compileSdk.get().toInt()
1212

1313
defaultConfig {
14-
versionCode = 6
15-
versionName = "1.1.3"
16-
targetSdk = 35
14+
minSdk = libs.versions.minSdk.get().toInt()
15+
targetSdk = libs.versions.targetSdk.get().toInt()
16+
17+
versionCode = libs.versions.versionCode.get().toInt()
18+
versionName = libs.versions.versionName.get()
1719
}
1820

1921
buildTypes {

build-logic/src/main/java/com/yapp/convention/ComposeAndroid.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginE
88
internal fun Project.configureComposeAndroid() {
99
with(plugins) {
1010
apply("org.jetbrains.kotlin.plugin.compose")
11+
apply("com.github.skydoves.compose.stability.analyzer")
1112
}
1213

13-
val libs = extensions.libs
1414
androidExtension.apply {
1515
dependencies {
1616
val bom = libs.findLibrary("compose.bom").get()

build-logic/src/main/java/com/yapp/convention/CoroutineAndroid.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ internal fun Project.configureCoroutine() {
99
}
1010

1111
private fun Project.addImplementation(libraryKey: String) {
12-
val libs = extensions.libs
1312
dependencies {
1413
"implementation"(libs.findLibrary(libraryKey).get())
1514
}

build-logic/src/main/java/com/yapp/convention/Extension.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import com.android.build.api.dsl.LibraryExtension
66
import org.gradle.api.Project
77
import org.gradle.api.artifacts.VersionCatalog
88
import org.gradle.api.artifacts.VersionCatalogsExtension
9-
import org.gradle.api.plugins.ExtensionContainer
109
import org.gradle.kotlin.dsl.getByType
1110
import org.jetbrains.kotlin.konan.properties.Properties
1211

@@ -22,8 +21,8 @@ internal val Project.androidExtension: CommonExtension<*, *, *, *, *, *>
2221
.onFailure { println("Could not find Library or Application extension from this project") }
2322
.getOrThrow()
2423

25-
internal val ExtensionContainer.libs: VersionCatalog
26-
get() = getByType<VersionCatalogsExtension>().named("libs")
24+
internal val Project.libs: VersionCatalog
25+
get() = extensions.getByType<VersionCatalogsExtension>().named("libs")
2726

2827
internal fun CommonExtension<*, *, *, *, *, *>.addBuildConfigFields(project: Project) {
2928
val baseUrl = project.getLocalProperty("baseUrl", "https://default.example.com")

build-logic/src/main/java/com/yapp/convention/HiltAndroid.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ internal fun Project.configureHiltAndroid() {
1010
apply("com.google.devtools.ksp")
1111
}
1212

13-
val libs = extensions.libs
1413
dependencies {
1514
"implementation"(libs.findLibrary("hilt.android").get())
1615
"ksp"(libs.findLibrary("hilt.android.compiler").get())

build-logic/src/main/java/com/yapp/convention/HiltKotlin.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ internal fun Project.configureHiltKotlin() {
99
apply("com.google.devtools.ksp")
1010
}
1111

12-
val libs = extensions.libs
1312
dependencies {
1413
"implementation"(libs.findLibrary("hilt.core").get())
1514
"ksp"(libs.findLibrary("hilt.compiler").get())

build-logic/src/main/java/com/yapp/convention/KotlinAndroid.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ internal fun Project.configureKotlinAndroid() {
1515
pluginManager.apply("org.jetbrains.kotlin.plugin.serialization")
1616

1717
androidExtension.apply {
18-
compileSdk = 34
18+
compileSdk = libs.findVersion("compileSdk").get().requiredVersion.toInt()
1919

2020
defaultConfig {
21-
minSdk = 28
21+
minSdk = libs.findVersion("minSdk").get().requiredVersion.toInt()
2222
}
2323

2424
buildFeatures {

build-logic/src/main/java/com/yapp/convention/TestAndroid.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ internal fun Project.configureTestAndroid() {
1212
}
1313

1414
internal fun Project.configureComposeUiTest() {
15-
val libs = extensions.libs
1615
dependencies {
1716
"androidTestImplementation"(libs.findLibrary("compose-ui-test-junit4").get())
1817
"debugImplementation"(libs.findLibrary("compose-ui-test-manifest").get())
@@ -24,7 +23,6 @@ internal fun Project.configureJUnitAndroid() {
2423
androidExtension.apply {
2524
defaultConfig { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" }
2625

27-
val libs = extensions.libs
2826
dependencies {
2927
"androidTestImplementation"(libs.findLibrary("androidx-test-ext-junit").get())
3028
"androidTestImplementation"(libs.findLibrary("androidx-test-runner").get())

build-logic/src/main/java/com/yapp/convention/TestCoverage.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import org.gradle.testing.jacoco.tasks.JacocoReport
1313
internal fun Project.configureTestCoverage() {
1414
pluginManager.apply("jacoco")
1515

16-
val libs = extensions.libs
1716
extensions.configure<JacocoPluginExtension> {
1817
toolVersion = libs.findVersion("jacoco").get().toString()
1918
}

build-logic/src/main/java/com/yapp/convention/TestKotlin.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import org.gradle.api.Project
44
import org.gradle.kotlin.dsl.dependencies
55

66
internal fun Project.configureTestKotlin() {
7-
val libs = extensions.libs
87
dependencies {
98
// JUnit4 단위 테스트 프레임워크
109
"testImplementation"(libs.findLibrary("junit4").get())

0 commit comments

Comments
 (0)