Skip to content

Commit f18f521

Browse files
markushimarkushi
committed
Merge branch 'main' into markushi/fix/stretched-dialogs-sr
2 parents 7a1e7d8 + e0d5c10 commit f18f521

63 files changed

Lines changed: 187 additions & 192 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle.kts‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,23 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
1010

1111
plugins {
1212
`java-library`
13-
id(Config.QualityPlugins.spotless) version Config.QualityPlugins.spotlessVersion apply true
13+
alias(libs.plugins.spotless)
1414
jacoco
15-
id(Config.QualityPlugins.detekt) version Config.QualityPlugins.detektVersion
15+
alias(libs.plugins.detekt)
1616
`maven-publish`
17-
id(Config.QualityPlugins.binaryCompatibilityValidator) version Config.QualityPlugins.binaryCompatibilityValidatorVersion
18-
id(Config.QualityPlugins.jacocoAndroid) version Config.QualityPlugins.jacocoAndroidVersion apply false
19-
id(Config.QualityPlugins.kover) version Config.QualityPlugins.koverVersion apply false
20-
id(Config.BuildPlugins.gradleMavenPublishPlugin) version Config.BuildPlugins.gradleMavenPublishPluginVersion apply false
17+
alias(libs.plugins.binary.compatibility.validator)
18+
alias(libs.plugins.jacoco.android) apply false
19+
alias(libs.plugins.kover) apply false
20+
alias(libs.plugins.vanniktech.maven.publish) apply false
2121
alias(libs.plugins.kotlin.android) apply false
22+
alias(libs.plugins.buildconfig) apply false
23+
// dokka is required by gradle-maven-publish-plugin.
24+
alias(libs.plugins.dokka) apply false
25+
alias(libs.plugins.dokka.javadoc) apply false
26+
alias(libs.plugins.compose.compiler) apply false
27+
alias(libs.plugins.errorprone) apply false
28+
alias(libs.plugins.gradle.versions) apply false
29+
alias(libs.plugins.spring.dependency.management) apply false
2230
}
2331

2432
buildscript {
@@ -27,16 +35,10 @@ buildscript {
2735
}
2836
dependencies {
2937
classpath(Config.BuildPlugins.androidGradle)
30-
// dokka is required by gradle-maven-publish-plugin.
31-
classpath(Config.BuildPlugins.dokkaPlugin)
32-
classpath(Config.QualityPlugins.errorpronePlugin)
33-
classpath(Config.QualityPlugins.gradleVersionsPlugin)
3438

3539
// add classpath of sentry android gradle plugin
3640
// classpath("io.sentry:sentry-android-gradle-plugin:{version}")
3741

38-
classpath(Config.QualityPlugins.binaryCompatibilityValidatorPlugin)
39-
classpath(Config.BuildPlugins.composeGradlePlugin)
4042
classpath(Config.BuildPlugins.commonsCompressOverride)
4143
}
4244
}

‎buildSrc/src/main/java/Config.kt‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,12 @@ object Config {
99
val springBoot3Version = "3.4.2"
1010
val kotlinCompatibleLanguageVersion = "1.6"
1111

12-
// see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility
13-
// see https://developer.android.com/jetpack/androidx/releases/compose-kotlin
14-
val composeVersion = "1.6.11"
1512
val androidComposeCompilerVersion = "1.5.14"
1613

1714
object BuildPlugins {
1815
val androidGradle = "com.android.tools.build:gradle:$AGP"
19-
val buildConfig = "com.github.gmazzo.buildconfig"
20-
val buildConfigVersion = "5.6.5"
21-
val springBoot = "org.springframework.boot"
22-
val springDependencyManagement = "io.spring.dependency-management"
23-
val springDependencyManagementVersion = "1.0.11.RELEASE"
2416
val gretty = "org.gretty"
2517
val grettyVersion = "4.0.0"
26-
val gradleMavenPublishPlugin = "com.vanniktech.maven.publish"
27-
val gradleMavenPublishPluginVersion = "0.30.0"
28-
val dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:2.0.0"
29-
val dokkaPluginAlias = "org.jetbrains.dokka"
30-
val dokkaPluginJavadocAlias = "org.jetbrains.dokka-javadoc"
31-
val composeGradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$composeVersion"
3218
val commonsCompressOverride = "org.apache.commons:commons-compress:1.25.0"
3319
}
3420

@@ -223,22 +209,9 @@ object Config {
223209
// TODO [POTEL] add tests and restore
224210
val minimumCoverage = BigDecimal.valueOf(0.1)
225211
}
226-
val spotless = "com.diffplug.spotless"
227-
val spotlessVersion = "6.11.0"
228-
val errorProne = "net.ltgt.errorprone"
229-
val errorpronePlugin = "net.ltgt.gradle:gradle-errorprone-plugin:3.0.1"
230-
val gradleVersionsPlugin = "com.github.ben-manes:gradle-versions-plugin:0.42.0"
231-
val gradleVersions = "com.github.ben-manes.versions"
232-
val detekt = "io.gitlab.arturbosch.detekt"
233-
val detektVersion = "1.23.8"
212+
213+
// this can be removed when we upgrade to Gradle 8, which allows us to use a getter for the plugin ID
234214
val detektPlugin = "io.gitlab.arturbosch.detekt"
235-
val binaryCompatibilityValidatorVersion = "0.13.0"
236-
val binaryCompatibilityValidatorPlugin = "org.jetbrains.kotlinx:binary-compatibility-validator:$binaryCompatibilityValidatorVersion"
237-
val binaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibility-validator"
238-
val jacocoAndroid = "com.mxalbert.gradle.jacoco-android"
239-
val jacocoAndroidVersion = "0.2.0"
240-
val kover = "org.jetbrains.kotlinx.kover"
241-
val koverVersion = "0.7.3"
242215
}
243216

244217
object Sentry {

‎gradle/libs.versions.toml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,29 @@
11
[versions]
22
kotlin = "1.9.24"
3+
# see https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compatibility-and-versioning.html#kotlin-compatibility
4+
# see https://developer.android.com/jetpack/androidx/releases/compose-kotlin
5+
composeVersion = "1.6.11"
6+
springTwo = "2.7.18"
7+
springThree = "3.4.2"
38

49
[plugins]
510
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
611
kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
12+
buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.6.5" }
13+
dokka = { id = "org.jetbrains.dokka", version = "2.0.0" }
14+
dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version = "2.0.0" }
15+
binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.0" }
16+
compose-compiler = { id = "org.jetbrains.compose", version.ref = "composeVersion" }
17+
errorprone = { id = "net.ltgt.errorprone", version = "3.0.1" }
18+
gradle-versions = {id = "com.github.ben-manes.versions", version = "0.42.0" }
19+
spotless = { id = "com.diffplug.spotless", version = "6.11.0" }
20+
detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8"}
21+
jacoco-android = { id = "com.mxalbert.gradle.jacoco-android", version = "0.2.0" }
22+
kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.3" }
23+
vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
24+
spring-boot-two = { id = "org.springframework.boot", version.ref = "springTwo" }
25+
spring-boot-three = { id = "org.springframework.boot", version.ref = "springThree" }
26+
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.0.11.RELEASE"}
727

828
[libraries]
929
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }

‎sentry-android-core/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ plugins {
55
id("com.android.library")
66
kotlin("android")
77
jacoco
8-
id(Config.QualityPlugins.jacocoAndroid)
9-
id(Config.QualityPlugins.errorProne)
10-
id(Config.QualityPlugins.gradleVersions)
8+
alias(libs.plugins.jacoco.android)
9+
alias(libs.plugins.errorprone)
10+
alias(libs.plugins.gradle.versions)
1111
}
1212

1313
android {

‎sentry-android-fragment/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ plugins {
44
id("com.android.library")
55
kotlin("android")
66
jacoco
7-
id(Config.QualityPlugins.jacocoAndroid)
8-
id(Config.QualityPlugins.gradleVersions)
9-
id(Config.QualityPlugins.detektPlugin)
7+
alias(libs.plugins.jacoco.android)
8+
alias(libs.plugins.gradle.versions)
9+
alias(libs.plugins.detekt)
1010
}
1111

1212
android {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import net.ltgt.gradle.errorprone.errorprone
44
plugins {
55
id("com.android.application")
66
kotlin("android")
7-
id(Config.QualityPlugins.errorProne)
8-
id(Config.QualityPlugins.gradleVersions)
9-
id(Config.QualityPlugins.detektPlugin)
7+
alias(libs.plugins.errorprone)
8+
alias(libs.plugins.gradle.versions)
9+
alias(libs.plugins.detekt)
1010
}
1111

1212
android {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import net.ltgt.gradle.errorprone.errorprone
44
plugins {
55
id("com.android.application")
66
kotlin("android")
7-
id(Config.QualityPlugins.errorProne)
8-
id(Config.QualityPlugins.gradleVersions)
9-
id(Config.QualityPlugins.detektPlugin)
7+
alias(libs.plugins.errorprone)
8+
alias(libs.plugins.gradle.versions)
9+
alias(libs.plugins.detekt)
1010
}
1111

1212
android {

‎sentry-android-navigation/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ plugins {
44
id("com.android.library")
55
kotlin("android")
66
jacoco
7-
id(Config.QualityPlugins.jacocoAndroid)
8-
id(Config.QualityPlugins.gradleVersions)
9-
id(Config.QualityPlugins.detektPlugin)
7+
alias(libs.plugins.jacoco.android)
8+
alias(libs.plugins.gradle.versions)
9+
alias(libs.plugins.detekt)
1010
}
1111

1212
android {

‎sentry-android-ndk/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ plugins {
44
id("com.android.library")
55
kotlin("android")
66
jacoco
7-
id(Config.QualityPlugins.jacocoAndroid)
8-
id(Config.QualityPlugins.gradleVersions)
7+
alias(libs.plugins.jacoco.android)
8+
alias(libs.plugins.gradle.versions)
99
}
1010

1111
android {

‎sentry-android-replay/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ plugins {
66
id("com.android.library")
77
kotlin("android")
88
jacoco
9-
id(Config.QualityPlugins.jacocoAndroid)
10-
id(Config.QualityPlugins.gradleVersions)
9+
alias(libs.plugins.jacoco.android)
10+
alias(libs.plugins.gradle.versions)
1111
// TODO: enable it later
12-
// id(Config.QualityPlugins.detektPlugin)
12+
// alias(libs.plugins.detekt)
1313
}
1414

1515
android {

0 commit comments

Comments
 (0)