Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import io.sentry.gradle.AggregateJavadoc
import org.gradle.api.attributes.Category
import org.gradle.api.attributes.LibraryElements
import org.gradle.kotlin.dsl.creating
import org.gradle.kotlin.dsl.getValue
import org.gradle.kotlin.dsl.named

val javadocPublisher by configurations.creating {
val javadocPublisher = configurations.create("javadocPublisher") {
isCanBeConsumed = false
isCanBeResolved = true
attributes {
Expand All @@ -15,7 +13,7 @@ val javadocPublisher by configurations.creating {
}

subprojects {
javadocPublisher.dependencies.add(dependencies.create(this))
javadocPublisher.dependencies.add(rootProject.dependencies.project(path))
}

val javadocCollection = javadocPublisher.incoming.artifactView { lenient(true) }.files
Expand Down
2 changes: 1 addition & 1 deletion build-logic/src/main/kotlin/io.sentry.javadoc.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val javadocConfig: Configuration by configurations.creating {
val javadocConfig: Configuration = configurations.create("javadocConfig") {
isCanBeResolved = false
isCanBeConsumed = true

Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ apiValidation {

allprojects {
group = Config.Sentry.group
version = properties[Config.Sentry.versionNameProp].toString()
version = providers.gradleProperty(Config.Sentry.versionNameProp).get()
description = Config.Sentry.description
tasks {
withType<Test>().configureEach {
Expand Down
7 changes: 5 additions & 2 deletions buildSrc/src/main/java/Publication.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@ private object Consts {
val taskRegex = Regex("(.*)DistZip")
}

private fun Project.versionName(): String =
providers.gradleProperty("versionName").get()

// configure distZip tasks for multiplatform
fun DistributionContainer.configureForMultiplatform(project: Project) {
val sep = File.separator
val version = project.properties["versionName"].toString()
val version = project.versionName()
val name = project.name

this.maybeCreate("android").contents {
Expand Down Expand Up @@ -69,7 +72,7 @@ fun DistributionContainer.configureForMultiplatform(project: Project) {

fun DistributionContainer.configureForJvm(project: Project) {
val sep = File.separator
val version = project.properties["versionName"].toString()
val version = project.versionName()
val name = project.name

this.getByName("main").contents {
Expand Down
6 changes: 3 additions & 3 deletions sentry-compose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ kotlin {
}

sourceSets {
val commonMain by getting {
getByName("commonMain") {
compilerOptions {
apiVersion.set(KotlinVersion.KOTLIN_1_9)
languageVersion.set(KotlinVersion.KOTLIN_1_9)
}
}
val androidMain by getting {
getByName("androidMain") {
dependencies {
api(projects.sentry)
api(projects.sentryAndroidNavigation)
Expand All @@ -60,7 +60,7 @@ kotlin {
implementation(libs.androidx.lifecycle.common.java8)
}
}
val androidUnitTest by getting {
getByName("androidUnitTest") {
dependencies {
implementation(libs.androidx.compose.ui.test.junit4)
implementation(libs.androidx.navigation.compose)
Expand Down
Loading