Merge pull request #11 from Team-B1ND/feature/10-create-navigation

Create navigation route
Team-B1ND · Jan 9, 2024 · d7c34db · d7c34db
2 parents 3de6bb0 + 8fa91e6
commit d7c34db
Show file tree

Hide file tree

Showing 57 changed files with 529 additions and 365 deletions.
diff --git a/.gitignore b/.gitignore
@@ -207,6 +207,10 @@ atlassian-ide-plugin.xml
 # Mongo Explorer plugin
 .idea/mongoSettings.xml
 
+*.csv
+*.json
+*.txt
+
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
diff --git a/app/src/main/java/kr/hs/dgsw/smartschool/dodamdodam/MainActivity.kt b/app/src/main/java/kr/hs/dgsw/smartschool/dodamdodam/MainActivity.kt
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
@@ -4,43 +4,54 @@ plugins {
     `kotlin-dsl`
 }
 
+group = "com.b1nd.dodam.buildlogic"
+
+repositories {
+    google()
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+val compileKotlin: KotlinCompile by tasks
+compileKotlin.kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString()
+
 java {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
 }
 
-tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-}
-
 dependencies {
-    compileOnly(libs.android.gradlePlugin)
-    compileOnly(libs.kotlin.gradlePlugin)
+    implementation(libs.kotlin.gradle.plugin)
+    implementation(libs.android.gradle.plugin)
 }
 
 gradlePlugin {
     plugins {
-        register("androidApplicationCompose") {
-            id = "dodamdodam.android.application.compose"
-            implementationClass = "AndroidApplicationComposeConventionPlugin"
-        }
+        // primitives
         register("androidApplication") {
-            id = "dodamdodam.android.application"
-            implementationClass = "AndroidApplicationConventionPlugin"
+            id = "b1nd.dodam.primitive.android.application"
+            implementationClass = "com.b1nd.dodam.primitive.AndroidApplicationPlugin"
+        }
+        register("androidCompose") {
+            id = "b1nd.dodam.primitive.android.compose"
+            implementationClass = "com.b1nd.dodam.primitive.AndroidComposePlugin"
+        }
+        register("androidHilt") {
+            id = "b1nd.dodam.primitive.android.hilt"
+            implementationClass = "com.b1nd.dodam.primitive.AndroidHiltPlugin"
         }
-        register("androidLibraryCompose") {
-            id = "dodamdodam.android.library.compose"
-            implementationClass = "AndroidLibraryComposeConventionPlugin"
+        register("androidKotlin") {
+            id = "b1nd.dodam.primitive.android.kotlin"
+            implementationClass = "com.b1nd.dodam.primitive.AndroidKotlinPlugin"
         }
-        register("androidLibrary") {
-            id = "dodamdodam.android.library"
-            implementationClass = "AndroidLibraryConventionPlugin"
+        register("android") {
+            id = "b1nd.dodam.primitive.android"
+            implementationClass = "com.b1nd.dodam.primitive.AndroidPlugin"
         }
-        register("jvmLibrary") {
-            id = "dodamdodam.jvm.library"
-            implementationClass = "JvmLibraryConventionPlugin"
+        // convention
+        register("androidFeature") {
+            id = "b1nd.dodam.convention.android.feature"
+            implementationClass = "com.b1nd.dodam.convention.AndroidFeaturePlugin"
         }
     }
 }
diff --git a/build-logic/convention/src/main/java/AndroidApplicationComposeConventionPlugin.kt b/build-logic/convention/src/main/java/AndroidApplicationComposeConventionPlugin.kt
diff --git a/build-logic/convention/src/main/java/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/java/AndroidApplicationConventionPlugin.kt
diff --git a/build-logic/convention/src/main/java/AndroidLibraryComposeConventionPlugin.kt b/build-logic/convention/src/main/java/AndroidLibraryComposeConventionPlugin.kt
diff --git a/build-logic/convention/src/main/java/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/java/AndroidLibraryConventionPlugin.kt
diff --git a/build-logic/convention/src/main/java/JvmLibraryConventionPlugin.kt b/build-logic/convention/src/main/java/JvmLibraryConventionPlugin.kt
diff --git a/build-logic/convention/src/main/java/kr/hs/dgsw/smartschool/convention/AndroidCompose.kt b/build-logic/convention/src/main/java/kr/hs/dgsw/smartschool/convention/AndroidCompose.kt