[Chore] local-enums 제거

duckie-team · Jun 15, 2024 · 7781e04 · 7781e04
1 parent 5dbd5b7
commit 7781e04
Show file tree

Hide file tree

Showing 47 changed files with 104 additions and 356 deletions.
diff --git a/.github/workflows/android-cd.yml b/.github/workflows/android-cd.yml
@@ -88,9 +88,6 @@ jobs:
         with:
           gradle-home-cache-cleanup: true
 
-      - name: Setup MavenLocal
-        run: ./gradlew :build-logic:local-enums:publishToMavenLocal
-
       # # TODO(riflockle7): aab 문제 있을 시 참고
       # - name: build and sign StandardRelease
       #   run: ./gradlew assembleStandardRelease

diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
@@ -34,9 +34,6 @@ jobs:
         with:
           gradle-home-cache-cleanup: true
 
-      - name: Setup MavenLocal
-        run: ./gradlew :build-logic:local-enums:publishToMavenLocal
-
       - name: Check ktLint
         run: ./gradlew ktlintCheck
 

diff --git a/README.md b/README.md
@@ -39,10 +39,6 @@ Edit Configurations -> Set `Launch Options` like this:
 
 ![](assets/art/duckie-launch-options.png)
 
-### Build prerequisites
-
-1. This project is uses MavenLocal. Please run: `./gradlew :build-logic:local-enums:publishToMavenLocal`.
-
 ## Project Dependencies Graph
 
 ![dependencies](https://github.com/duckie-team/duckie-android/assets/80076029/39e60250-cebd-424c-bc32-b1a272a6d879)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,9 +12,9 @@ import org.jetbrains.kotlin.konan.properties.Properties
 import java.io.FileInputStream
 
 plugins {
-    id(ConventionEnum.AndroidApplication)
-    id(ConventionEnum.AndroidHilt)
-    id(ConventionEnum.AppVersionNameProvider)
+    alias(libs.plugins.duckie.android.application)
+    alias(libs.plugins.duckie.android.hilt)
+    alias(libs.plugins.duckie.version.name.provider)
     id(libs.plugins.gms.google.service.get().pluginId)
     id(libs.plugins.firebase.crashlytics.get().pluginId)
     id(libs.plugins.firebase.performance.get().pluginId)

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -11,70 +11,54 @@ import DependencyHandler.Extensions.implementations
 
 plugins {
     `kotlin-dsl`
-    alias(libs.plugins.kotlin.dokka)
     alias(libs.plugins.util.dependency.handler.extensions)
-    alias(libs.plugins.local.convention.enum)
 }
 
 group = "team.duckie.app.android.local"
 
 dependencies {
     implementations(
         libs.kotlin.core,
-        libs.kotlin.dokka.base,
-        libs.kotlin.dokka.plugin,
         libs.build.gradle.agp,
-        libs.build.local.plugin.enum,
         libs.build.dependency.handler.extensions,
     )
     compileOnly(libs.ksp.gradlePlugin)
 }
 
 gradlePlugin {
     plugins {
+        val prefix = "duckie"
         register("appVersionNameProviderPlugin") {
-            id = ConventionEnum.AppVersionNameProvider
+            id = "$prefix.app.version.name.provider"
             implementationClass = "AppVersionNameProvider"
         }
         register("androidHiltPlugin") {
-            id = ConventionEnum.AndroidHilt
+            id = "$prefix.android.hilt"
             implementationClass = "AndroidHiltPlugin"
         }
         register("androidApplicationPlugin") {
-            id = ConventionEnum.AndroidApplication
+            id = "$prefix.android.application"
             implementationClass = "AndroidApplicationPlugin"
         }
-        register("androidApplicationComposePlugin") {
-            id = ConventionEnum.AndroidApplicationCompose
-            implementationClass = "AndroidApplicationComposePlugin"
-        }
         register("androidLibraryPlugin") {
-            id = ConventionEnum.AndroidLibrary
+            id = "$prefix.android.library"
             implementationClass = "AndroidLibraryPlugin"
         }
         register("androidLibraryComposePlugin") {
-            id = ConventionEnum.AndroidLibraryCompose
+            id = "$prefix.android.library.compose"
             implementationClass = "AndroidLibraryComposePlugin"
         }
-        register("androidLibraryComposeUiTestPlugin") {
-            id = ConventionEnum.AndroidLibraryComposeUiTest
-            implementationClass = "AndroidLibraryComposeUiTestPlugin"
-        }
         register("androidRoom") {
-            id = ConventionEnum.AndroidRoom
+            id = "$prefix.android.room"
             implementationClass = "AndroidRoomConventionPlugin"
         }
         register("jvmLibraryPlugin") {
-            id = ConventionEnum.JvmLibrary
+            id = "$prefix.jvm.library"
             implementationClass = "JvmLibraryPlugin"
         }
-        register("jvmJunit4Plugin") {
-            id = ConventionEnum.JvmJUnit4
-            implementationClass = "JvmJUnit4Plugin"
-        }
-        register("jvmDokkaPlugin") {
-            id = ConventionEnum.JvmDokka
-            implementationClass = "JvmDokkaPlugin"
+        register("jvmJunitPlugin") {
+            id = "$prefix.jvm.junit"
+            implementationClass = "JvmJUnitPlugin"
         }
     }
 }
diff --git a/build-logic/local-enums/PUBLISHING.md b/build-logic/local-enums/PUBLISHING.md
diff --git a/build-logic/local-enums/build.gradle.kts b/build-logic/local-enums/build.gradle.kts
diff --git a/build-logic/local-enums/settings.gradle.kts b/build-logic/local-enums/settings.gradle.kts
diff --git a/build-logic/local-enums/src/main/kotlin/ConventionEnum.kt b/build-logic/local-enums/src/main/kotlin/ConventionEnum.kt
diff --git a/build-logic/local-enums/src/main/kotlin/PluginEnum.kt b/build-logic/local-enums/src/main/kotlin/PluginEnum.kt
diff --git a/build-logic/src/main/kotlin/AndroidApplicationComposePlugin.kt b/build-logic/src/main/kotlin/AndroidApplicationComposePlugin.kt
diff --git a/build-logic/src/main/kotlin/AndroidApplicationPlugin.kt b/build-logic/src/main/kotlin/AndroidApplicationPlugin.kt
@@ -24,8 +24,7 @@ internal class AndroidApplicationPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             applyPlugins(
-                PluginEnum.AndroidApplication,
-                PluginEnum.KotlinAndroid,
+                "com.android.application",
             )
 
             extensions.configure<BaseAppModuleExtension> {

diff --git a/build-logic/src/main/kotlin/AndroidHiltPlugin.kt b/build-logic/src/main/kotlin/AndroidHiltPlugin.kt
@@ -7,6 +7,7 @@
 
 import DependencyHandler.Extensions.implementations
 import DependencyHandler.Extensions.kapts
+import DependencyHandler.Extensions.ksps
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
@@ -20,13 +21,13 @@ internal class AndroidHiltPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             applyPlugins(
-                PluginEnum.KotlinKapt,
                 libs.findPlugin("di-hilt").get().get().pluginId,
+                "com.google.devtools.ksp",
             )
 
             dependencies {
                 implementations(libs.findLibrary("di-hilt-core").get())
-                kapts(libs.findLibrary("di-hilt-compiler").get())
+                ksps(libs.findLibrary("di-hilt-compiler").get())
             }
         }
     }

diff --git a/build-logic/src/main/kotlin/AndroidLibraryComposeUiTestPlugin.kt b/build-logic/src/main/kotlin/AndroidLibraryComposeUiTestPlugin.kt
diff --git a/build-logic/src/main/kotlin/AndroidLibraryPlugin.kt b/build-logic/src/main/kotlin/AndroidLibraryPlugin.kt
@@ -23,8 +23,8 @@ internal class AndroidLibraryPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             applyPlugins(
-                PluginEnum.AndroidLibrary,
-                PluginEnum.KotlinAndroid,
+                "com.android.library",
+                "kotlin-android"
             )
 
             extensions.configure<LibraryExtension> {