Skip to content

Commit ec7b1e8

Browse files
committed
Don't publish build-distribution, align kotlin versions
1 parent ad1b69d commit ec7b1e8

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ subprojects {
161161
}
162162
}
163163

164-
if (!this.name.contains("sample") && !this.name.contains("integration-tests") && this.name != "sentry-system-test-support" && this.name != "sentry-test-support") {
164+
if (!this.name.contains("sample") && !this.name.contains("integration-tests") && this.name != "sentry-system-test-support" && this.name != "sentry-test-support" && this.name != "sentry-android-distribution") {
165165
apply<DistributionPlugin>()
166166
apply<com.vanniktech.maven.publish.MavenPublishPlugin>()
167167

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.config.KotlinCompilerVersion
2+
13
plugins {
24
id("com.android.library")
35
alias(libs.plugins.kotlin.android)
@@ -8,14 +10,19 @@ android {
810
namespace = "io.sentry.android.distribution"
911

1012
defaultConfig { minSdk = libs.versions.minSdk.get().toInt() }
11-
buildFeatures {
12-
// Determines whether to generate a BuildConfig class.
13-
buildConfig = false
14-
}
13+
buildFeatures { buildConfig = false }
14+
}
15+
16+
kotlin {
17+
jvmToolchain(17)
18+
explicitApi()
1519
}
1620

1721
androidComponents.beforeVariants {
1822
it.enable = !Config.Android.shouldSkipDebugVariant(it.buildType)
1923
}
2024

21-
dependencies { api(projects.sentry) }
25+
dependencies {
26+
implementation(projects.sentry)
27+
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
28+
}

sentry-bom/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ dependencies {
99
.filter {
1010
!it.name.startsWith("sentry-samples") &&
1111
it.name != project.name &&
12-
!it.name.contains("test", ignoreCase = true)
12+
!it.name.contains("test", ignoreCase = true) &&
13+
!it.name.contains("sentry-android-distribution")
1314
}
1415
.forEach { project ->
1516
evaluationDependsOn(project.path)

0 commit comments

Comments
 (0)