Merge branch 'main' into feat/user-feedback-widget

Author: markushi

build.gradle.kts

@@ -10,15 +10,23 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     `java-library`
-    id(Config.QualityPlugins.spotless) version Config.QualityPlugins.spotlessVersion apply true
+    alias(libs.plugins.spotless)
     jacoco
-    id(Config.QualityPlugins.detekt) version Config.QualityPlugins.detektVersion
+    alias(libs.plugins.detekt)
     `maven-publish`
-    id(Config.QualityPlugins.binaryCompatibilityValidator) version Config.QualityPlugins.binaryCompatibilityValidatorVersion
-    id(Config.QualityPlugins.jacocoAndroid) version Config.QualityPlugins.jacocoAndroidVersion apply false
-    id(Config.QualityPlugins.kover) version Config.QualityPlugins.koverVersion apply false
-    id(Config.BuildPlugins.gradleMavenPublishPlugin) version Config.BuildPlugins.gradleMavenPublishPluginVersion apply false
+    alias(libs.plugins.binary.compatibility.validator)
+    alias(libs.plugins.jacoco.android) apply false
+    alias(libs.plugins.kover) apply false
+    alias(libs.plugins.vanniktech.maven.publish) apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.buildconfig) apply false
+    // dokka is required by gradle-maven-publish-plugin.
+    alias(libs.plugins.dokka) apply false
+    alias(libs.plugins.dokka.javadoc) apply false
+    alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.errorprone) apply false
+    alias(libs.plugins.gradle.versions) apply false
+    alias(libs.plugins.spring.dependency.management) apply false
 }
 
 buildscript {
@@ -27,16 +35,10 @@ buildscript {
     }
     dependencies {
         classpath(Config.BuildPlugins.androidGradle)
-        // dokka is required by gradle-maven-publish-plugin.
-        classpath(Config.BuildPlugins.dokkaPlugin)
-        classpath(Config.QualityPlugins.errorpronePlugin)
-        classpath(Config.QualityPlugins.gradleVersionsPlugin)
 
         // add classpath of sentry android gradle plugin
         // classpath("io.sentry:sentry-android-gradle-plugin:{version}")
 
-        classpath(Config.QualityPlugins.binaryCompatibilityValidatorPlugin)
-        classpath(Config.BuildPlugins.composeGradlePlugin)
         classpath(Config.BuildPlugins.commonsCompressOverride)
     }
 }

buildSrc/src/main/java/Config.kt

@@ -9,36 +9,14 @@ object Config {
     val springBoot3Version = "3.4.2"
     val kotlinCompatibleLanguageVersion = "1.6"
 
-    // see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility
-    // see https://developer.android.com/jetpack/androidx/releases/compose-kotlin
-    val composeVersion = "1.6.11"
     val androidComposeCompilerVersion = "1.5.14"
 
     object BuildPlugins {
         val androidGradle = "com.android.tools.build:gradle:$AGP"
-        val buildConfig = "com.github.gmazzo.buildconfig"
-        val buildConfigVersion = "5.6.5"
-        val springBoot = "org.springframework.boot"
-        val springDependencyManagement = "io.spring.dependency-management"
-        val springDependencyManagementVersion = "1.0.11.RELEASE"
-        val gretty = "org.gretty"
-        val grettyVersion = "4.0.0"
-        val gradleMavenPublishPlugin = "com.vanniktech.maven.publish"
-        val gradleMavenPublishPluginVersion = "0.30.0"
-        val dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:2.0.0"
-        val dokkaPluginAlias = "org.jetbrains.dokka"
-        val dokkaPluginJavadocAlias = "org.jetbrains.dokka-javadoc"
-        val composeGradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$composeVersion"
         val commonsCompressOverride = "org.apache.commons:commons-compress:1.25.0"
     }
 
     object Android {
-        private val sdkVersion = 34
-
-        val minSdkVersion = 21
-        val targetSdkVersion = sdkVersion
-        val compileSdkVersion = sdkVersion
-
         val abiFilters = listOf("x86", "armeabi-v7a", "x86_64", "arm64-v8a")
 
         fun shouldSkipDebugVariant(name: String?): Boolean {
@@ -57,7 +35,6 @@ object Config {
         private val lifecycleVersion = "2.2.0"
         val lifecycleProcess = "androidx.lifecycle:lifecycle-process:$lifecycleVersion"
         val lifecycleCommonJava8 = "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
-        val androidxCore = "androidx.core:core:1.3.2"
         val androidxSqlite = "androidx.sqlite:sqlite:2.3.1"
         val androidxRecylerView = "androidx.recyclerview:recyclerview:1.2.1"
         val androidxAnnotation = "androidx.annotation:annotation:1.9.1"
@@ -144,20 +121,6 @@ object Config {
         val kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect"
         val kotlinStdLib = "org.jetbrains.kotlin:kotlin-stdlib"
 
-        private val navigationVersion = "2.4.2"
-        val navigationRuntime = "androidx.navigation:navigation-runtime:$navigationVersion"
-
-        // compose deps
-        val composeNavigation = "androidx.navigation:navigation-compose:$navigationVersion"
-        val composeActivity = "androidx.activity:activity-compose:1.8.2"
-        val composeFoundation = "androidx.compose.foundation:foundation:1.6.3"
-        val composeUi = "androidx.compose.ui:ui:1.6.3"
-        val composeFoundationLayout = "androidx.compose.foundation:foundation-layout:1.6.3"
-        val composeMaterial = "androidx.compose.material3:material3:1.2.1"
-
-        val composeUiReplay = "androidx.compose.ui:ui:1.5.0" // Note: don't change without testing forwards compatibility
-        val composeCoil = "io.coil-kt:coil-compose:2.6.0"
-
         val apolloKotlin = "com.apollographql.apollo3:apollo-runtime:3.8.2"
         val apolloKotlin4 = "com.apollographql.apollo:apollo-runtime:4.1.1"
 
@@ -188,57 +151,25 @@ object Config {
     }
 
     object TestLibs {
-        private val espressoVersion = "3.5.0"
-
         val androidJUnitRunner = "androidx.test.runner.AndroidJUnitRunner"
-        val androidxCore = "androidx.test:core:1.6.1"
-        val androidxRunner = "androidx.test:runner:1.6.2"
-        val androidxTestCoreKtx = "androidx.test:core-ktx:1.6.1"
-        val androidxTestRules = "androidx.test:rules:1.6.1"
-        val espressoCore = "androidx.test.espresso:espresso-core:$espressoVersion"
-        val espressoIdlingResource = "androidx.test.espresso:espresso-idling-resource:$espressoVersion"
-        val androidxTestOrchestrator = "androidx.test:orchestrator:1.5.0"
-        val androidxJunit = "androidx.test.ext:junit:1.1.5"
-        val androidxCoreKtx = "androidx.core:core-ktx:1.7.0"
-        val robolectric = "org.robolectric:robolectric:4.14"
-        val mockitoKotlin = "org.mockito.kotlin:mockito-kotlin:4.1.0"
-        val mockitoInline = "org.mockito:mockito-inline:4.8.0"
         val awaitility = "org.awaitility:awaitility-kotlin:4.1.1"
         val awaitility3 = "org.awaitility:awaitility-kotlin:3.1.6" // need this due to a conflict of awaitility4+ and espresso on hamcrest
-        val mockWebserver = "com.squareup.okhttp3:mockwebserver:${Libs.okHttpVersion}"
-        val jsonUnit = "net.javacrumbs.json-unit:json-unit:2.32.0"
         val hsqldb = "org.hsqldb:hsqldb:2.6.1"
         val javaFaker = "com.github.javafaker:javafaker:1.0.2"
         val msgpack = "org.msgpack:msgpack-core:0.9.8"
         val leakCanaryInstrumentation = "com.squareup.leakcanary:leakcanary-android-instrumentation:2.14"
         val composeUiTestJunit4 = "androidx.compose.ui:ui-test-junit4:1.6.8"
         val okio = "com.squareup.okio:okio:1.13.0"
-        val coroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1"
     }
 
     object QualityPlugins {
         object Jacoco {
-            val version = "0.8.7"
-
             // TODO [POTEL] add tests and restore
             val minimumCoverage = BigDecimal.valueOf(0.1)
         }
-        val spotless = "com.diffplug.spotless"
-        val spotlessVersion = "6.11.0"
-        val errorProne = "net.ltgt.errorprone"
-        val errorpronePlugin = "net.ltgt.gradle:gradle-errorprone-plugin:3.0.1"
-        val gradleVersionsPlugin = "com.github.ben-manes:gradle-versions-plugin:0.42.0"
-        val gradleVersions = "com.github.ben-manes.versions"
-        val detekt = "io.gitlab.arturbosch.detekt"
-        val detektVersion = "1.23.8"
+
+        // this can be removed when we upgrade to Gradle 8, which allows us to use a getter for the plugin ID
         val detektPlugin = "io.gitlab.arturbosch.detekt"
-        val binaryCompatibilityValidatorVersion = "0.13.0"
-        val binaryCompatibilityValidatorPlugin = "org.jetbrains.kotlinx:binary-compatibility-validator:$binaryCompatibilityValidatorVersion"
-        val binaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibility-validator"
-        val jacocoAndroid = "com.mxalbert.gradle.jacoco-android"
-        val jacocoAndroidVersion = "0.2.0"
-        val kover = "org.jetbrains.kotlinx.kover"
-        val koverVersion = "0.7.3"
     }
 
     object Sentry {

gradle/libs.versions.toml

@@ -1,9 +1,66 @@
 [versions]
+androidxNavigation = "2.4.2"
+androidxTestCore = "1.6.1"
+androidxComposeVersion = "1.6.3"
+jetbrainsComposeVersion = "1.6.11"
+espresso = "3.5.0"
 kotlin = "1.9.24"
+# see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility
+# see https://developer.android.com/jetpack/androidx/releases/compose-kotlin
+okhttp = "4.9.2"
+springTwo = "2.7.18"
+springThree = "3.4.2"
+targetSdk = "34"
+compileSdk = "34"
+minSdk = "21"
+jacoco = "0.8.7"
 
 [plugins]
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
+buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.6.5" }
+dokka = { id = "org.jetbrains.dokka", version = "2.0.0" }
+dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version = "2.0.0" }
+binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.0" }
+compose-compiler = { id = "org.jetbrains.compose", version.ref = "jetbrainsComposeVersion" }
+errorprone = { id = "net.ltgt.errorprone", version = "3.0.1" }
+gradle-versions = { id = "com.github.ben-manes.versions", version = "0.42.0" }
+spotless = { id = "com.diffplug.spotless", version = "6.11.0" }
+detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8" }
+jacoco-android = { id = "com.mxalbert.gradle.jacoco-android", version = "0.2.0" }
+kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.3" }
+vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
+spring-boot-two = { id = "org.springframework.boot", version.ref = "springTwo" }
+spring-boot-three = { id = "org.springframework.boot", version.ref = "springThree" }
+spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE" }
+gretty = { id = "org.gretty", version = "4.0.0" }
 
 [libraries]
+androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.2" }
+androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidxComposeVersion" }
+androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidxComposeVersion" }
+androidx-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.2.1" }
+androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidxComposeVersion" }
+# Note: don't change without testing forwards compatibility
+androidx-compose-ui-replay = { module = "androidx.compose.ui:ui", version = "1.5.0" }
+androidx-core = { module = "androidx.core:core", version = "1.3.2"}
+androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.7.0" }
+androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidxNavigation" }
+androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" }
+coil-compose = { module = "io.coil-kt:coil-compose", version = "2.6.0" }
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
+
+# test libraries
+androidx-test-core = { module = "androidx.test:core", version.ref = "androidxTestCore" }
+androidx-test-core-ktx = { module = "androidx.test:core-ktx", version.ref = "androidxTestCore" }
+androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
+androidx-test-espresso-idling-resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "espresso" }
+androidx-test-ext-junit = { module = "androidx.test.ext:junit", version = "1.1.5" }
+androidx-test-orchestrator = { module = "androidx.test:orchestrator", version = "1.5.0" }
+androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidxTestCore" }
+androidx-test-runner = { module = "androidx.test:runner", version = "1.6.2" }
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version = "1.6.1" }
+mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version = "4.1.0" }
+mockito-inline = { module = "org.mockito:mockito-inline", version = "4.8.0" }
+okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
+roboelectric = { module = "org.robolectric:robolectric", version = "4.14" }

sentry-android-core/build.gradle.kts

@@ -5,17 +5,17 @@ plugins {
     id("com.android.library")
     kotlin("android")
     jacoco
-    id(Config.QualityPlugins.jacocoAndroid)
-    id(Config.QualityPlugins.errorProne)
-    id(Config.QualityPlugins.gradleVersions)
+    alias(libs.plugins.jacoco.android)
+    alias(libs.plugins.errorprone)
+    alias(libs.plugins.gradle.versions)
 }
 
 android {
-    compileSdk = Config.Android.compileSdkVersion
+    compileSdk = libs.versions.compileSdk.get().toInt()
     namespace = "io.sentry.android.core"
 
     defaultConfig {
-        minSdk = Config.Android.minSdkVersion
+        minSdk = libs.versions.minSdk.get().toInt()
 
         testInstrumentationRunner = Config.TestLibs.androidJUnitRunner
 
@@ -85,7 +85,7 @@ dependencies {
     // lifecycle processor, session tracking
     implementation(Config.Libs.lifecycleProcess)
     implementation(Config.Libs.lifecycleCommonJava8)
-    implementation(Config.Libs.androidxCore)
+    implementation(libs.androidx.core)
 
     compileOnly(Config.CompileOnly.nopen)
     errorprone(Config.CompileOnly.nopenChecker)
@@ -95,22 +95,22 @@ dependencies {
 
     // tests
     testImplementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
-    testImplementation(Config.TestLibs.robolectric)
+    testImplementation(libs.roboelectric)
     testImplementation(libs.kotlin.test.junit)
-    testImplementation(Config.TestLibs.androidxCore)
-    testImplementation(Config.TestLibs.androidxRunner)
-    testImplementation(Config.TestLibs.androidxJunit)
-    testImplementation(Config.TestLibs.androidxCoreKtx)
-    testImplementation(Config.TestLibs.mockitoKotlin)
-    testImplementation(Config.TestLibs.mockitoInline)
+    testImplementation(libs.androidx.core.ktx)
+    testImplementation(libs.androidx.test.core)
+    testImplementation(libs.androidx.test.ext.junit)
+    testImplementation(libs.androidx.test.runner)
+    testImplementation(libs.mockito.kotlin)
+    testImplementation(libs.mockito.inline)
     testImplementation(Config.TestLibs.awaitility)
     testImplementation(projects.sentryTestSupport)
     testImplementation(projects.sentryAndroidFragment)
     testImplementation(projects.sentryAndroidTimber)
     testImplementation(projects.sentryAndroidReplay)
     testImplementation(projects.sentryCompose)
     testImplementation(projects.sentryAndroidNdk)
-    testRuntimeOnly(Config.Libs.composeUi)
+    testRuntimeOnly(libs.androidx.compose.ui)
     testRuntimeOnly(Config.Libs.timber)
     testRuntimeOnly(Config.Libs.fragment)
 }

sentry-android-fragment/build.gradle.kts

@@ -4,17 +4,17 @@ plugins {
     id("com.android.library")
     kotlin("android")
     jacoco
-    id(Config.QualityPlugins.jacocoAndroid)
-    id(Config.QualityPlugins.gradleVersions)
-    id(Config.QualityPlugins.detektPlugin)
+    alias(libs.plugins.jacoco.android)
+    alias(libs.plugins.gradle.versions)
+    alias(libs.plugins.detekt)
 }
 
 android {
-    compileSdk = Config.Android.compileSdkVersion
+    compileSdk = libs.versions.compileSdk.get().toInt()
     namespace = "io.sentry.android.fragment"
 
     defaultConfig {
-        minSdk = Config.Android.minSdkVersion
+        minSdk = libs.versions.minSdk.get().toInt()
 
         // for AGP 4.1
         buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
@@ -70,8 +70,8 @@ dependencies {
     // tests
     testImplementation(Config.Libs.fragment)
     testImplementation(libs.kotlin.test.junit)
-    testImplementation(Config.TestLibs.mockitoKotlin)
-    testImplementation(Config.TestLibs.mockitoInline)
+    testImplementation(libs.mockito.kotlin)
+    testImplementation(libs.mockito.inline)
 }
 
 tasks.withType<Detekt>().configureEach {

sentry-android-integration-tests/sentry-uitest-android-benchmark/build.gradle.kts

@@ -4,19 +4,19 @@ import net.ltgt.gradle.errorprone.errorprone
 plugins {
     id("com.android.application")
     kotlin("android")
-    id(Config.QualityPlugins.errorProne)
-    id(Config.QualityPlugins.gradleVersions)
-    id(Config.QualityPlugins.detektPlugin)
+    alias(libs.plugins.errorprone)
+    alias(libs.plugins.gradle.versions)
+    alias(libs.plugins.detekt)
 }
 
 android {
-    compileSdk = Config.Android.compileSdkVersion
+    compileSdk = libs.versions.compileSdk.get().toInt()
     namespace = "io.sentry.uitest.android.benchmark"
 
     defaultConfig {
         applicationId = "io.sentry.uitest.android.benchmark"
-        minSdk = Config.Android.minSdkVersion
-        targetSdk = Config.Android.targetSdkVersion
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = "1.0.0"
 
@@ -89,24 +89,24 @@ dependencies {
 
     implementation(projects.sentryAndroid)
     implementation(Config.Libs.appCompat)
-    implementation(Config.Libs.androidxCore)
+    implementation(libs.androidx.core)
     implementation(Config.Libs.androidxRecylerView)
     implementation(Config.Libs.constraintLayout)
-    implementation(Config.TestLibs.espressoIdlingResource)
+    implementation(libs.androidx.test.espresso.idling.resource)
 
     compileOnly(Config.CompileOnly.nopen)
     errorprone(Config.CompileOnly.nopenChecker)
     errorprone(Config.CompileOnly.errorprone)
     errorprone(Config.CompileOnly.errorProneNullAway)
 
+    androidTestUtil(libs.androidx.test.orchestrator)
     androidTestImplementation(projects.sentryTestSupport)
     androidTestImplementation(libs.kotlin.test.junit)
-    androidTestImplementation(Config.TestLibs.espressoCore)
-    androidTestImplementation(Config.TestLibs.androidxTestCoreKtx)
-    androidTestImplementation(Config.TestLibs.androidxRunner)
-    androidTestImplementation(Config.TestLibs.androidxTestRules)
-    androidTestImplementation(Config.TestLibs.androidxJunit)
-    androidTestUtil(Config.TestLibs.androidxTestOrchestrator)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+    androidTestImplementation(libs.androidx.test.core.ktx)
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.rules)
+    androidTestImplementation(libs.androidx.test.runner)
 }
 
 tasks.withType<JavaCompile>().configureEach {