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
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ clikt = "com.github.ajalt.clikt:clikt:3.5.0"
tapmoc = "com.gradleup.tapmoc:tapmoc-gradle-plugin:0.3.2"
tapmoc-at-build-time = "com.gradleup.tapmoc:tapmoc-gradle-plugin:0.2.1-SNAPSHOT-dda1362c1d0f8389f50b362a08967793e320cf29"
coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0"
dokka = "org.jetbrains.dokka:dokka-gradle-plugin:2.1.0-Beta"
dokka = "org.jetbrains.dokka:dokka-gradle-plugin:2.2.0"
google-auth = "com.google.auth:google-auth-library-oauth2-http:1.19.0"
gradle-api = "dev.gradleplugins:gradle-api:8.8"
gratatouille-gradle-plugin = "com.gradleup.gratatouille:com.gradleup.gratatouille.gradle.plugin:0.2.2"
Expand Down
6 changes: 3 additions & 3 deletions librarian-gradle-plugin/api/librarian-gradle-plugin.api
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public final class com/gradleup/librarian/gradle/Coordinates {
public final class com/gradleup/librarian/gradle/DokkaKt {
public static final fun Coordinates (Ljava/lang/String;)Lcom/gradleup/librarian/gradle/Coordinates;
public static final fun configureDokka (Lorg/gradle/api/Project;)V
public static final fun configureDokkaAggregate (Lorg/gradle/api/Project;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Z)Lorg/gradle/api/tasks/TaskProvider;
public static final fun configureDokkaAggregate (Lorg/gradle/api/Project;Ljava/lang/String;Ljava/util/List;Ljava/lang/String;Ljava/util/List;)Lorg/gradle/api/tasks/TaskProvider;
}

public final class com/gradleup/librarian/gradle/Gcs {
Expand All @@ -47,9 +47,9 @@ public final class com/gradleup/librarian/gradle/GeneratedVersionKt {
}

public final class com/gradleup/librarian/gradle/Kdoc {
public fun <init> (ZLjava/util/List;)V
public final fun getIncludeSelf ()Z
public fun <init> (Ljava/util/List;Ljava/util/List;)V
public final fun getOlderVersions ()Ljava/util/List;
public final fun getProjects ()Ljava/util/List;
}

public final class com/gradleup/librarian/gradle/KmpKt {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ fun Project.configureDokkaAggregate(
currentVersion: String,
olderVersions: List<Coordinates>,
aggregateConfiguration: String,
includeSelf: Boolean,
projectPaths: List<String>,
): TaskProvider<Jar> {
val jar = configureDokkaInternal {
dependencies.add(
Expand Down Expand Up @@ -104,11 +104,8 @@ fun Project.configureDokkaAggregate(
}
}

allprojects {
if (it == this && !includeSelf) {
return@allprojects
}
dependencies.add("dokka", it)
projectPaths.forEach {
dependencies.add("dokka", dependencies.project(mapOf("path" to it)))
}

configurePublishingInternal {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ internal fun Properties.olderVersions(): List<Coordinates> {
}
}

internal fun Properties.projects(): List<String> {
return getProperty("kdoc.projects")?.split(",")
.orEmpty()
.filter {
it.isNotEmpty()
}
}

internal fun Project.rootProperties(): Properties {
val propertiesFile = rootDir.resolve(rootPropertiesFilename)
check(propertiesFile.exists()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ fun Gcs(properties: Properties): Gcs? {
}

class Kdoc(
val includeSelf: Boolean,
val projects: List<String>,
val olderVersions: List<Coordinates>,
)

fun Kdoc(properties: Properties): Kdoc {
return Kdoc(
false,
properties.projects(),
properties.olderVersions(),
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ fun Project.librarianRoot() {
)
}


fun Project.librarianRoot(
group: String,
version: String,
Expand Down Expand Up @@ -58,7 +57,7 @@ fun Project.librarianRoot(
currentVersion = version,
olderVersions = kdoc.olderVersions,
aggregateConfiguration = "nmcpAggregation",
includeSelf = kdoc.includeSelf,
projectPaths = kdoc.projects,
)

val nmcpAggregation = extensions.getByType(NmcpAggregationExtension::class.java)
Expand Down
Loading