Format with ktfmt

Author: runningcode

.editorconfig

@@ -2,19 +2,18 @@ root = true
 
 [*]
 indent_style = space
+indent_size = 2
 trim_trailing_whitespace = true
 insert_final_newline = true
+max_line_length = 140
+ij_java_names_count_to_use_import_on_demand = 9999
+ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
 
 [*.md]
 trim_trailing_whitespace = false
 
 [*.java]
-indent_size = 2
 charset = utf-8
 
 [*.{kt,kts}]
-indent_size = 4
 charset = utf-8
-
-[*.xml]
-indent_size = 2

build-logic/src/main/kotlin/io.sentry.spotless.gradle.kts

@@ -7,31 +7,19 @@ plugins {
 spotless {
     lineEndings = LineEnding.UNIX
     java {
-        target("**/*.java")
+        target("src/*/java/**/*.java")
         removeUnusedImports()
         googleJavaFormat()
         targetExclude("src/**/java/io/sentry/vendor/**")
     }
     kotlin {
-        target("**/*.kt")
-        ktlint()
+        target("src/*/kotlin/**/*.kt", "src/*/java/**/*.kt")
+        ktfmt().googleStyle()
         targetExclude("src/test/java/io/sentry/apollo4/generated/**", "src/test/java/io/sentry/apollo3/adapter/**")
-        suppressLintsFor {
-            step = "ktlint"
-            shortCode = "standard:max-line-length"
-        }
-        suppressLintsFor {
-            step = "ktlint"
-            shortCode = "standard:property-naming"
-        }
-        suppressLintsFor {
-            step = "ktlint"
-            shortCode = "standard:function-naming"
-        }
     }
     kotlinGradle {
-        target("**/*.kts")
-        ktlint()
+        target("*.gradle.kts")
+        ktfmt().googleStyle()
     }
 }
 

sentry-android-core/build.gradle.kts

@@ -2,121 +2,109 @@ import net.ltgt.gradle.errorprone.errorprone
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
 
 plugins {
-    id("com.android.library")
-    kotlin("android")
-    jacoco
-    alias(libs.plugins.jacoco.android)
-    alias(libs.plugins.errorprone)
-    alias(libs.plugins.gradle.versions)
+  id("com.android.library")
+  kotlin("android")
+  jacoco
+  alias(libs.plugins.jacoco.android)
+  alias(libs.plugins.errorprone)
+  alias(libs.plugins.gradle.versions)
 }
 
 android {
-    compileSdk =
-        libs.versions.compileSdk
-            .get()
-            .toInt()
-    namespace = "io.sentry.android.core"
+  compileSdk = libs.versions.compileSdk.get().toInt()
+  namespace = "io.sentry.android.core"
 
-    defaultConfig {
-        minSdk =
-            libs.versions.minSdk
-                .get()
-                .toInt()
+  defaultConfig {
+    minSdk = libs.versions.minSdk.get().toInt()
 
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
-        buildConfigField("String", "SENTRY_ANDROID_SDK_NAME", "\"${Config.Sentry.SENTRY_ANDROID_SDK_NAME}\"")
+    buildConfigField(
+      "String",
+      "SENTRY_ANDROID_SDK_NAME",
+      "\"${Config.Sentry.SENTRY_ANDROID_SDK_NAME}\"",
+    )
 
-        // for AGP 4.1
-        buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
-    }
+    // for AGP 4.1
+    buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
+  }
 
-    buildTypes {
-        getByName("debug") {
-            consumerProguardFiles("proguard-rules.pro")
-        }
-        getByName("release") {
-            consumerProguardFiles("proguard-rules.pro")
-        }
-    }
+  buildTypes {
+    getByName("debug") { consumerProguardFiles("proguard-rules.pro") }
+    getByName("release") { consumerProguardFiles("proguard-rules.pro") }
+  }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
+  kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() }
 
-    testOptions {
-        animationsDisabled = true
-        unitTests.apply {
-            isReturnDefaultValues = true
-            isIncludeAndroidResources = true
-        }
+  testOptions {
+    animationsDisabled = true
+    unitTests.apply {
+      isReturnDefaultValues = true
+      isIncludeAndroidResources = true
     }
+  }
 
-    lint {
-        warningsAsErrors = true
-        checkDependencies = true
+  lint {
+    warningsAsErrors = true
+    checkDependencies = true
 
-        // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks.
-        checkReleaseBuilds = false
-    }
+    // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks.
+    checkReleaseBuilds = false
+  }
 
-    buildFeatures {
-        buildConfig = true
-    }
+  buildFeatures { buildConfig = true }
 
-    // needed because of Kotlin 1.4.x
-    configurations.all {
-        resolutionStrategy.force(libs.jetbrains.annotations.get())
-    }
+  // needed because of Kotlin 1.4.x
+  configurations.all { resolutionStrategy.force(libs.jetbrains.annotations.get()) }
 
-    androidComponents.beforeVariants {
-        it.enable = !Config.Android.shouldSkipDebugVariant(it.buildType)
-    }
+  androidComponents.beforeVariants {
+    it.enable = !Config.Android.shouldSkipDebugVariant(it.buildType)
+  }
 }
 
 tasks.withType<JavaCompile>().configureEach {
-    options.errorprone {
-        check("NullAway", net.ltgt.gradle.errorprone.CheckSeverity.ERROR)
-        option("NullAway:AnnotatedPackages", "io.sentry")
-    }
+  options.errorprone {
+    check("NullAway", net.ltgt.gradle.errorprone.CheckSeverity.ERROR)
+    option("NullAway:AnnotatedPackages", "io.sentry")
+  }
 }
 
 dependencies {
-    api(projects.sentry)
-    compileOnly(libs.jetbrains.annotations)
-    compileOnly(libs.nopen.annotations)
-    compileOnly(projects.sentryAndroidFragment)
-    compileOnly(projects.sentryAndroidTimber)
-    compileOnly(projects.sentryAndroidReplay)
-    compileOnly(projects.sentryCompose)
-
-    // lifecycle processor, session tracking
-    implementation(libs.androidx.lifecycle.common.java8)
-    implementation(libs.androidx.lifecycle.process)
-    implementation(libs.androidx.core)
-
-    errorprone(libs.errorprone.core)
-    errorprone(libs.nopen.checker)
-    errorprone(libs.nullaway)
-
-    // tests
-    testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
-    testImplementation(libs.roboelectric)
-    testImplementation(libs.kotlin.test.junit)
-    testImplementation(libs.androidx.core.ktx)
-    testImplementation(libs.androidx.test.core)
-    testImplementation(libs.androidx.test.ext.junit)
-    testImplementation(libs.androidx.test.runner)
-    testImplementation(libs.awaitility.kotlin)
-    testImplementation(libs.mockito.kotlin)
-    testImplementation(libs.mockito.inline)
-    testImplementation(projects.sentryTestSupport)
-    testImplementation(projects.sentryAndroidFragment)
-    testImplementation(projects.sentryAndroidTimber)
-    testImplementation(projects.sentryAndroidReplay)
-    testImplementation(projects.sentryCompose)
-    testImplementation(projects.sentryAndroidNdk)
-    testRuntimeOnly(libs.androidx.compose.ui)
-    testRuntimeOnly(libs.androidx.fragment.ktx)
-    testRuntimeOnly(libs.timber)
+  api(projects.sentry)
+  compileOnly(libs.jetbrains.annotations)
+  compileOnly(libs.nopen.annotations)
+  compileOnly(projects.sentryAndroidFragment)
+  compileOnly(projects.sentryAndroidTimber)
+  compileOnly(projects.sentryAndroidReplay)
+  compileOnly(projects.sentryCompose)
+
+  // lifecycle processor, session tracking
+  implementation(libs.androidx.lifecycle.common.java8)
+  implementation(libs.androidx.lifecycle.process)
+  implementation(libs.androidx.core)
+
+  errorprone(libs.errorprone.core)
+  errorprone(libs.nopen.checker)
+  errorprone(libs.nullaway)
+
+  // tests
+  testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  testImplementation(libs.roboelectric)
+  testImplementation(libs.kotlin.test.junit)
+  testImplementation(libs.androidx.core.ktx)
+  testImplementation(libs.androidx.test.core)
+  testImplementation(libs.androidx.test.ext.junit)
+  testImplementation(libs.androidx.test.runner)
+  testImplementation(libs.awaitility.kotlin)
+  testImplementation(libs.mockito.kotlin)
+  testImplementation(libs.mockito.inline)
+  testImplementation(projects.sentryTestSupport)
+  testImplementation(projects.sentryAndroidFragment)
+  testImplementation(projects.sentryAndroidTimber)
+  testImplementation(projects.sentryAndroidReplay)
+  testImplementation(projects.sentryCompose)
+  testImplementation(projects.sentryAndroidNdk)
+  testRuntimeOnly(libs.androidx.compose.ui)
+  testRuntimeOnly(libs.androidx.fragment.ktx)
+  testRuntimeOnly(libs.timber)
 }