Merge pull request #78 from Nexters/dev

Release 1.0.3

Author: eshc123

.gitignore

@@ -114,6 +114,7 @@ obj/
 .idea/assetWizardSettings.xml
 .idea/.gitignore
 .idea/gradle.xml
+.idea/codeStyles/
 
 deploymentTargetDropDown.xml
 

app/.gitignore

@@ -1,4 +1,5 @@
 /build
+/release
 .kotlin/
 
 # Created by https://www.gitignore.io/api/kotlin,androidstudio

app/build.gradle.kts

@@ -2,24 +2,18 @@ import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.jetbrains.kotlin.android)
-    alias(libs.plugins.hilt.android)
-    alias(libs.plugins.kotlin.ksp)
+    id("missionmate.android.application")
 }
 
 android {
     namespace = "com.goalpanzi.mission_mate"
-    compileSdk = 34
 
     defaultConfig {
         applicationId = "com.goalpanzi.mission_mate"
-        minSdk = 26
         targetSdk = 34
-        versionCode = 5
-        versionName = "1.0.2"
+        versionCode = 6
+        versionName = "1.0.3"
 
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary = true
         }
@@ -46,23 +40,6 @@ android {
             isDebuggable = false
         }
     }
-    buildFeatures {
-        buildConfig = true
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    kotlin {
-        compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_17)
-        }
-    }
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
 }
 
 dependencies {

build-logic/.gitignore

@@ -0,0 +1 @@
+/build

build-logic/build.gradle.kts

@@ -0,0 +1,27 @@
+plugins {
+    `kotlin-dsl`
+}
+
+dependencies {
+    implementation(libs.android.gradle.plugin)
+    implementation(libs.kotlin.gradle.plugin)
+    compileOnly(libs.ksp.gradle.plugin)
+    compileOnly(libs.compose.compiler.gradle.plugin)
+}
+
+gradlePlugin {
+    plugins {
+        register("androidApplication") {
+            id = "missionmate.android.application"
+            implementationClass = "MissionmateAndroidApplicationPlugin"
+        }
+        register("androidLibrary") {
+            id = "missionmate.android.library"
+            implementationClass = "MissionmateAndroidLibrary"
+        }
+        register("androidHilt") {
+            id = "missionmate.android.hilt"
+            implementationClass = "com.goalpanzi.mission_mate.convention.HiltAndroidPlugin"
+        }
+    }
+}

build-logic/settings.gradle.kts

@@ -0,0 +1,14 @@
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+@Suppress("UnstableApiUsage")
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}

build-logic/src/main/kotlin/com/goalpanzi/mission_mate/convention/AppNameExtension.kt

@@ -0,0 +1,9 @@
+package com.goalpanzi.mission_mate.convention
+
+import org.gradle.api.Project
+
+fun Project.setNamespace(name: String) {
+    androidExtension.apply {
+        namespace = "com.goalpanzi.mission_mate.$name"
+    }
+}

build-logic/src/main/kotlin/com/goalpanzi/mission_mate/convention/ComposeAndroid.kt

@@ -0,0 +1,41 @@
+package com.goalpanzi.mission_mate.convention
+
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.getByType
+import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
+
+internal fun Project.configureComposeAndroid() {
+    with(plugins) {
+        apply("org.jetbrains.kotlin.plugin.compose")
+    }
+
+    val libs = extensions.libs
+    androidExtension.apply {
+        buildFeatures {
+            compose = true
+        }
+
+        dependencies {
+            val bom = libs.findLibrary("androidx-compose-bom").get()
+            implementation(platform(bom))
+            implementation(libs.findLibrary("androidx.ui").get())
+            implementation(libs.findLibrary("androidx.ui.graphics").get())
+            implementation(libs.findLibrary("androidx.ui.tooling.preview").get())
+            implementation(libs.findLibrary("androidx.material3").get())
+            implementation(libs.findLibrary("androidx.material").get())
+            implementation(libs.findLibrary("androidx.navigation.compose").get())
+            implementation(libs.findLibrary("androidx.hilt.navigation.compose").get())
+
+            debugImplementation(libs.findLibrary("androidx.ui.tooling").get())
+            debugImplementation(libs.findLibrary("androidx.ui.test.manifest").get())
+
+            androidTestImplementation(platform(bom))
+            androidTestImplementation(libs.findLibrary("androidx.ui.test.junit4").get())
+        }
+    }
+
+    extensions.getByType<ComposeCompilerGradlePluginExtension>().apply {
+        enableStrongSkippingMode.set(true)
+    }
+}

build-logic/src/main/kotlin/com/goalpanzi/mission_mate/convention/CoroutineAndroid.kt

@@ -0,0 +1,20 @@
+package com.goalpanzi.mission_mate.convention
+
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.dependencies
+
+internal fun Project.configureCoroutineAndroid() {
+    val libs = extensions.libs
+    configureCoroutineKotlin()
+    dependencies {
+        implementation(libs.findLibrary("coroutines.android").get())
+    }
+}
+
+internal fun Project.configureCoroutineKotlin() {
+    val libs = extensions.libs
+    dependencies {
+        implementation(libs.findLibrary("coroutines.core").get())
+        testImplementation(libs.findLibrary("coroutines.test").get())
+    }
+}

build-logic/src/main/kotlin/com/goalpanzi/mission_mate/convention/Extension.kt

@@ -0,0 +1,46 @@
+package com.goalpanzi.mission_mate.convention
+
+import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.CommonExtension
+import com.android.build.api.dsl.LibraryExtension
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.api.artifacts.dsl.DependencyHandler
+import org.gradle.api.plugins.ExtensionContainer
+import org.gradle.kotlin.dsl.getByType
+
+internal val ExtensionContainer.libs: VersionCatalog
+    get() = getByType<VersionCatalogsExtension>().named("libs")
+
+internal val Project.androidExtension: CommonExtension<*, *, *, *, *, *>
+    get() = runCatching { libraryExtension }
+        .recoverCatching { applicationExtension }
+        .onFailure { println("Could not find Library or Application extension from this project") }
+        .getOrThrow()
+
+internal val Project.applicationExtension: CommonExtension<*, *, *, *, *, *>
+    get() = extensions.getByType<ApplicationExtension>()
+
+internal val Project.libraryExtension: CommonExtension<*, *, *, *, *, *>
+    get() = extensions.getByType<LibraryExtension>()
+
+internal fun DependencyHandler.implementation(dependencyNotation: Any) {
+    add("implementation", dependencyNotation)
+}
+
+internal fun DependencyHandler.testImplementation(dependencyNotation: Any) {
+    add("testImplementation", dependencyNotation)
+}
+
+internal fun DependencyHandler.androidTestImplementation(dependencyNotation: Any) {
+    add("androidTestImplementation", dependencyNotation)
+}
+
+internal fun DependencyHandler.debugImplementation(dependencyNotation: Any) {
+    add("debugImplementation", dependencyNotation)
+}
+
+internal fun DependencyHandler.ksp(dependencyNotation: Any) {
+    add("ksp", dependencyNotation)
+}