Unify Kotlin indent_size to 2

.editorconfig

@@ -8,7 +8,6 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 
 [*.{kt,kts}]
-indent_size = 4
 ij_kotlin_imports_layout = *
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true

build.gradle.kts

@@ -6,85 +6,85 @@ import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginE
 import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin
 
 plugins {
-  alias(libs.plugins.android.application) apply false
-  alias(libs.plugins.kotlin.android) apply false
-  alias(libs.plugins.kotlin.jvm) apply false
-  alias(libs.plugins.kotlin.compose) apply false
-  alias(libs.plugins.jetbrains.compose) apply false
-  alias(libs.plugins.jetbrains.intellij) apply false
-  alias(libs.plugins.jetbrains.intellij.module) apply false
-  alias(libs.plugins.spotless) apply false
+ alias(libs.plugins.android.application) apply false
+ alias(libs.plugins.kotlin.android) apply false
+ alias(libs.plugins.kotlin.jvm) apply false
+ alias(libs.plugins.kotlin.compose) apply false
+ alias(libs.plugins.jetbrains.compose) apply false
+ alias(libs.plugins.jetbrains.intellij) apply false
+ alias(libs.plugins.jetbrains.intellij.module) apply false
+ alias(libs.plugins.spotless) apply false
 }
 
 allprojects {
- plugins.withType<KotlinBasePlugin>().configureEach {
- dependencies {
- // https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
- "compileOnly"(libs.kotlin.stdlib)
- }
+ plugins.withType<KotlinBasePlugin>().configureEach {
+ dependencies {
+ // https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
+ "compileOnly"(libs.kotlin.stdlib)
  }
+ }
 
- plugins.withId(rootProject.libs.plugins.kotlin.compose.get().pluginId) {
- extensions.configure<ComposeCompilerGradlePluginExtension> {
- enableStrongSkippingMode = true
- stabilityConfigurationFile = rootProject.layout.projectDirectory.file("stability_config.conf")
- }
+ plugins.withId(rootProject.libs.plugins.kotlin.compose.get().pluginId) {
+ extensions.configure<ComposeCompilerGradlePluginExtension> {
+ enableStrongSkippingMode = true
+ stabilityConfigurationFile = rootProject.layout.projectDirectory.file("stability_config.conf")
  }
+ }
 
- plugins.withType<IntelliJPlatformBasePlugin>().configureEach {
- // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html#configuration.repositories
- repositories {
- google {
- mavenContent {
- includeGroupAndSubgroups("androidx")
- includeGroupAndSubgroups("com.android")
- includeGroupAndSubgroups("com.google")
- }
- }
- mavenCentral()
- intellijPlatform {
- defaultRepositories()
- }
- }
- // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html#setting-up-intellij-platform
- dependencies {
- extensions.configure<IntelliJPlatformDependenciesExtension> {
- intellijIdeaCommunity(libs.versions.idea)
- instrumentationTools()
- // dependency plugin id for https://plugins.jetbrains.com/plugin/6954-kotlin
- bundledPlugin(libs.kotlin.stdlib.map(Dependency::getGroup))
- }
+ plugins.withType<IntelliJPlatformBasePlugin>().configureEach {
+ // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html#configuration.repositories
+ repositories {
+ google {
+ mavenContent {
+ includeGroupAndSubgroups("androidx")
+ includeGroupAndSubgroups("com.android")
+ includeGroupAndSubgroups("com.google")
  }
+ }
+ mavenCentral()
+ intellijPlatform {
+ defaultRepositories()
+ }
  }
-
- plugins.apply(rootProject.libs.plugins.spotless.get().pluginId)
- extensions.configure<SpotlessExtension> {
- kotlin {
- target("src/**/*.kt")
- targetExclude("src/test/resources/**")
- ktlint(libs.ktlint.get().version)
- .customRuleSets(
- listOf(
- libs.composeRules.get().toString(),
- ),
- )
- }
- kotlinGradle {
- ktlint(libs.ktlint.get().version)
- }
+ // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html#setting-up-intellij-platform
+ dependencies {
+ extensions.configure<IntelliJPlatformDependenciesExtension> {
+ intellijIdeaCommunity(libs.versions.idea)
+ instrumentationTools()
+ // dependency plugin id for https://plugins.jetbrains.com/plugin/6954-kotlin
+ bundledPlugin(libs.kotlin.stdlib.map(Dependency::getGroup))
+ }
  }
+ }
 
- tasks.withType<Test>().configureEach {
- useJUnitPlatform()
- // https://docs.gradle.org/8.9/userguide/performance.html#execute_tests_in_parallel
- maxParallelForks = Runtime.getRuntime().availableProcessors()
+ plugins.apply(rootProject.libs.plugins.spotless.get().pluginId)
+ extensions.configure<SpotlessExtension> {
+ kotlin {
+ target("src/**/*.kt")
+ targetExclude("src/test/resources/**")
+ ktlint(libs.ktlint.get().version)
+ .customRuleSets(
+ listOf(
+ libs.composeRules.get().toString(),
+ ),
+ )
+ }
+ kotlinGradle {
+ ktlint(libs.ktlint.get().version)
  }
+ }
 
- configurations.configureEach {
- resolutionStrategy.eachDependency {
- if (requested.group == libs.kotlin.stdlib.get().group) {
- useVersion(libs.versions.kotlin.get())
- }
- }
+ tasks.withType<Test>().configureEach {
+ useJUnitPlatform()
+ // https://docs.gradle.org/8.9/userguide/performance.html#execute_tests_in_parallel
+ maxParallelForks = Runtime.getRuntime().availableProcessors()
+ }
+
+ configurations.configureEach {
+ resolutionStrategy.eachDependency {
+ if (requested.group == libs.kotlin.stdlib.get().group) {
+ useVersion(libs.versions.kotlin.get())
+ }
  }
+ }
 }

components/androidx-compose/build.gradle.kts

@@ -1,12 +1,12 @@
 plugins {
-  alias(libs.plugins.kotlin.jvm)
+ alias(libs.plugins.kotlin.jvm)
 }
 
 dependencies {
-  implementation(projects.components.generator.common)
+ implementation(projects.components.generator.common)
 
-  implementation(libs.kotlinpoet)
-  implementation(libs.xpp3)
+ implementation(libs.kotlinpoet)
+ implementation(libs.xpp3)
 
-  testImplementation(libs.bundles.test)
+ testImplementation(libs.bundles.test)
 }

components/androidx-compose/src/main/kotlin/androidx/compose/material/icons/generator/GraphicUnit.kt

@@ -3,22 +3,22 @@ package androidx.compose.material.icons.generator
 import com.squareup.kotlinpoet.MemberName
 
 sealed class GraphicUnit {
-  abstract val value: Float
-  abstract val memberName: MemberName?
+ abstract val value: Float
+ abstract val memberName: MemberName?
 }
 
 internal class Pixel(override val value: Float) : GraphicUnit() {
-  override val memberName: MemberName? = null
+ override val memberName: MemberName? = null
 }
 
 internal class Dp(override val value: Float) : GraphicUnit() {
-  override val memberName: MemberName = MemberNames.Dp
+ override val memberName: MemberName = MemberNames.Dp
 }
 
 internal fun rawAsGraphicUnit(raw: String): GraphicUnit {
-  val isStrokeDp = raw.endsWith("dp")
-  return when {
-  isStrokeDp -> Dp(raw.removeSuffix("dp").toFloat())
-  else -> Pixel(raw.toFloat())
-  }
+ val isStrokeDp = raw.endsWith("dp")
+ return when {
+ isStrokeDp -> Dp(raw.removeSuffix("dp").toFloat())
+ else -> Pixel(raw.toFloat())
+ }
 }