From 976d042d661017b0551bf14d89f599ff2bff9d48 Mon Sep 17 00:00:00 2001 From: Dongmin Date: Sat, 21 Sep 2024 19:08:22 +0900 Subject: [PATCH] feature #866: fix space 2->4 --- app/build.gradle.kts | 254 +++++++++++++++++++++---------------------- settings.gradle.kts | 70 ++++++------ 2 files changed, 162 insertions(+), 162 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 87b111c35..29b900515 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -26,164 +26,164 @@ import com.google.firebase.appdistribution.gradle.firebaseAppDistribution import java.util.Properties plugins { - sopt("application") - sopt("test") - sopt("compose") - alias(libs.plugins.google.services) - alias(libs.plugins.crashlytics) - alias(libs.plugins.ktlint) - alias(libs.plugins.secret) - alias(libs.plugins.app.distribution) - alias(libs.plugins.androidx.baselineprofile) + sopt("application") + sopt("test") + sopt("compose") + alias(libs.plugins.google.services) + alias(libs.plugins.crashlytics) + alias(libs.plugins.ktlint) + alias(libs.plugins.secret) + alias(libs.plugins.app.distribution) + alias(libs.plugins.androidx.baselineprofile) } val properties = Properties().apply { - load(rootProject.file("local.properties").inputStream()) + load(rootProject.file("local.properties").inputStream()) } android { - namespace = "org.sopt.official" + namespace = "org.sopt.official" - defaultConfig { - versionCode = libs.versions.versionCode.get().toInt() - versionName = libs.versions.appVersion.get() - applicationId = "org.sopt.official" + defaultConfig { + versionCode = libs.versions.versionCode.get().toInt() + versionName = libs.versions.appVersion.get() + applicationId = "org.sopt.official" - if (project.hasProperty("dev")) { - versionNameSuffix = "-Dev" - } - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } + if (project.hasProperty("dev")) { + versionNameSuffix = "-Dev" + } - signingConfigs { - getByName("debug") { - keyAlias = "androiddebugkey" - keyPassword = "android" - storeFile = File("${project.rootDir.absolutePath}/keystore/debug.keystore") - storePassword = "android" - } - create("release") { - keyAlias = properties.getProperty("keyAlias") - keyPassword = properties.getProperty("keyPassword") - storeFile = File("${project.rootDir.absolutePath}/keystore/releaseKey.jks") - storePassword = "soptandroid" + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } - } - - buildTypes { - val debug by getting { - applicationIdSuffix = ".debug" - firebaseAppDistribution { - artifactType = "APK" - groups = "app-team" - } - } - val release by getting { - isMinifyEnabled = true - isShrinkResources = true - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro", - ) - signingConfig = signingConfigs.getByName("release") + + signingConfigs { + getByName("debug") { + keyAlias = "androiddebugkey" + keyPassword = "android" + storeFile = File("${project.rootDir.absolutePath}/keystore/debug.keystore") + storePassword = "android" + } + create("release") { + keyAlias = properties.getProperty("keyAlias") + keyPassword = properties.getProperty("keyPassword") + storeFile = File("${project.rootDir.absolutePath}/keystore/releaseKey.jks") + storePassword = "soptandroid" + } } - val benchmark by creating { - initWith(release) - matchingFallbacks.add("release") - signingConfig = signingConfigs.getByName("debug") - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - isMinifyEnabled = true - isDebuggable = false + + buildTypes { + val debug by getting { + applicationIdSuffix = ".debug" + firebaseAppDistribution { + artifactType = "APK" + groups = "app-team" + } + } + val release by getting { + isMinifyEnabled = true + isShrinkResources = true + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro", + ) + signingConfig = signingConfigs.getByName("release") + } + val benchmark by creating { + initWith(release) + matchingFallbacks.add("release") + signingConfig = signingConfigs.getByName("debug") + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + isMinifyEnabled = true + isDebuggable = false + } } - } - applicationVariants.all { - val variant = this - kotlin { - sourceSets { - getByName(variant.name) { - kotlin.srcDir("build/generated/ksp/${variant.name}/kotlin") + applicationVariants.all { + val variant = this + kotlin { + sourceSets { + getByName(variant.name) { + kotlin.srcDir("build/generated/ksp/${variant.name}/kotlin") + } + } } - } } - } } dependencies { - implementation(projects.core.designsystem) - implementation(projects.domain.soptamp) - implementation(projects.domain.mypage) - implementation(projects.domain.poke) - implementation(projects.domain.notification) - implementation(projects.feature.soptamp) - implementation(projects.data.soptamp) - implementation(projects.data.mypage) - implementation(projects.data.poke) - implementation(projects.data.notification) - implementation(projects.core.common) - implementation(projects.core.analytics) - implementation(projects.core.network) - implementation(projects.core.auth) - implementation(projects.core.authimpl) - implementation(projects.core.webview) - implementation(projects.feature.auth) - implementation(projects.feature.mypage) - implementation(projects.feature.poke) - implementation(projects.feature.notification) + implementation(projects.core.designsystem) + implementation(projects.domain.soptamp) + implementation(projects.domain.mypage) + implementation(projects.domain.poke) + implementation(projects.domain.notification) + implementation(projects.feature.soptamp) + implementation(projects.data.soptamp) + implementation(projects.data.mypage) + implementation(projects.data.poke) + implementation(projects.data.notification) + implementation(projects.core.common) + implementation(projects.core.analytics) + implementation(projects.core.network) + implementation(projects.core.auth) + implementation(projects.core.authimpl) + implementation(projects.core.webview) + implementation(projects.feature.auth) + implementation(projects.feature.mypage) + implementation(projects.feature.poke) + implementation(projects.feature.notification) implementation(projects.feature.fortune) - baselineProfile(projects.baselineprofile) + baselineProfile(projects.baselineprofile) - implementation(libs.kotlin.coroutines.google.play) - implementation(platform(libs.compose.bom)) - implementation(libs.bundles.compose) - implementation(libs.startup) - implementation(libs.swipe.refresh.layout) + implementation(libs.kotlin.coroutines.google.play) + implementation(platform(libs.compose.bom)) + implementation(libs.bundles.compose) + implementation(libs.startup) + implementation(libs.swipe.refresh.layout) - implementation(libs.inappupdate) + implementation(libs.inappupdate) - implementation(platform(libs.okhttp.bom)) - implementation(libs.bundles.okhttp) + implementation(platform(libs.okhttp.bom)) + implementation(libs.bundles.okhttp) - implementation(libs.bundles.compose) + implementation(libs.bundles.compose) - implementation(platform(libs.firebase)) - implementation(libs.bundles.firebase) - implementation(libs.process.phoenix) + implementation(platform(libs.firebase)) + implementation(libs.bundles.firebase) + implementation(libs.process.phoenix) - implementation(libs.compose.destination.core) - implementation(libs.androidx.lifecycle.process) - implementation(libs.appcompat) - implementation(libs.material) - implementation(libs.fragment.ktx) + implementation(libs.compose.destination.core) + implementation(libs.androidx.lifecycle.process) + implementation(libs.appcompat) + implementation(libs.material) + implementation(libs.fragment.ktx) - androidTestImplementation(platform(libs.compose.bom)) - androidTestImplementation(libs.bundles.compose.test) - androidTestImplementation(libs.bundles.android.test) - debugImplementation(libs.bundles.compose.android.test) + androidTestImplementation(platform(libs.compose.bom)) + androidTestImplementation(libs.bundles.compose.test) + androidTestImplementation(libs.bundles.android.test) + debugImplementation(libs.bundles.compose.android.test) - implementation(libs.coil.core) - implementation(libs.profileinstaller) - implementation(libs.firebase.messaging.lifecycle.ktx) + implementation(libs.coil.core) + implementation(libs.profileinstaller) + implementation(libs.firebase.messaging.lifecycle.ktx) } secrets { - defaultPropertiesFileName = "secrets.defaults.properties" + defaultPropertiesFileName = "secrets.defaults.properties" - ignoreList.add("sdk.*") + ignoreList.add("sdk.*") } ktlint { - android.set(true) - debug.set(true) - coloredOutput.set(true) - verbose.set(true) - outputToConsole.set(true) - version.set("1.2.1") - filter { - exclude { projectDir.toURI().relativize(it.file.toURI()).path.contains("/generated/") } - exclude { it.file.name.contains("gradle") } - } + android.set(true) + debug.set(true) + coloredOutput.set(true) + verbose.set(true) + outputToConsole.set(true) + version.set("1.2.1") + filter { + exclude { projectDir.toURI().relativize(it.file.toURI()).path.contains("/generated/") } + exclude { it.file.name.contains("gradle") } + } } diff --git a/settings.gradle.kts b/settings.gradle.kts index b5755fe53..81a7a14e0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,43 +1,43 @@ pluginManagement { - includeBuild("build-logic") - repositories { - gradlePluginPortal() - google() - mavenCentral() - } + includeBuild("build-logic") + repositories { + gradlePluginPortal() + google() + mavenCentral() + } } dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - google() - mavenCentral() - gradlePluginPortal() - maven { setUrl("https://jitpack.io") } - } + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + gradlePluginPortal() + maven { setUrl("https://jitpack.io") } + } } rootProject.name = "SOPT" include( - ":app", - ":baselineprofile", - ":core:network", - ":core:analytics", - ":core:auth", - ":core:authimpl", - ":core:common", - ":core:designsystem", - ":core:webview", - ":data:mypage", - ":data:notification", - ":data:soptamp", - ":data:poke", - ":domain:mypage", - ":domain:notification", - ":domain:soptamp", - ":domain:poke", - ":feature:auth", - ":feature:mypage", - ":feature:notification", - ":feature:soptamp", - ":feature:poke", + ":app", + ":baselineprofile", + ":core:network", + ":core:analytics", + ":core:auth", + ":core:authimpl", + ":core:common", + ":core:designsystem", + ":core:webview", + ":data:mypage", + ":data:notification", + ":data:soptamp", + ":data:poke", + ":domain:mypage", + ":domain:notification", + ":domain:soptamp", + ":domain:poke", + ":feature:auth", + ":feature:mypage", + ":feature:notification", + ":feature:soptamp", + ":feature:poke", ":feature:fortune" )