Skip to content

Commit c1e93e2

Browse files
Merge pull request #308 from OneBusAway/release-please--branches--main--changes--next
release: 0.1.0-alpha.67
2 parents 19d523c + b90b23e commit c1e93e2

File tree

7 files changed

+66
-8
lines changed

7 files changed

+66
-8
lines changed

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "0.1.0-alpha.66"
2+
".": "0.1.0-alpha.67"
33
}

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## 0.1.0-alpha.67 (2025-05-15)
4+
5+
Full Changelog: [v0.1.0-alpha.66...v0.1.0-alpha.67](https://github.com/OneBusAway/kotlin-sdk/compare/v0.1.0-alpha.66...v0.1.0-alpha.67)
6+
7+
### Features
8+
9+
* generate and publish docs ([#274](https://github.com/OneBusAway/kotlin-sdk/issues/274)) ([4aecdbd](https://github.com/OneBusAway/kotlin-sdk/commit/4aecdbdb54266d24cae48500180c6e1903712645))
10+
11+
12+
### Chores
13+
14+
* **internal:** update java toolchain ([ed72b2f](https://github.com/OneBusAway/kotlin-sdk/commit/ed72b2f4944d7ce9ce611d7e0b1830f8761f55bf))
15+
316
## 0.1.0-alpha.66 (2025-03-07)
417

518
Full Changelog: [v0.1.0-alpha.65...v0.1.0-alpha.66](https://github.com/OneBusAway/kotlin-sdk/compare/v0.1.0-alpha.65...v0.1.0-alpha.66)

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
<!-- x-release-please-start-version -->
44

5-
[![Maven Central](https://img.shields.io/maven-central/v/org.onebusaway/onebusaway-sdk-kotlin)](https://central.sonatype.com/artifact/org.onebusaway/onebusaway-sdk-kotlin/0.1.0-alpha.66)
5+
[![Maven Central](https://img.shields.io/maven-central/v/org.onebusaway/onebusaway-sdk-kotlin)](https://central.sonatype.com/artifact/org.onebusaway/onebusaway-sdk-kotlin/0.1.0-alpha.67)
6+
[![javadoc](https://javadoc.io/badge2/org.onebusaway/onebusaway-sdk-kotlin/0.1.0-alpha.67/javadoc.svg)](https://javadoc.io/doc/org.onebusaway/onebusaway-sdk-kotlin/0.1.0-alpha.67)
67

78
<!-- x-release-please-end -->
89

@@ -12,7 +13,7 @@ The Onebusaway SDK Kotlin SDK is similar to the Onebusaway SDK Java SDK but with
1213

1314
It is generated with [Stainless](https://www.stainless.com/).
1415

15-
The REST API documentation can be found on [developer.onebusaway.org](https://developer.onebusaway.org).
16+
The REST API documentation can be found on [developer.onebusaway.org](https://developer.onebusaway.org). KDocs are also available on [javadoc.io](https://javadoc.io/doc/org.onebusaway/onebusaway-sdk-kotlin/0.1.0-alpha.65).
1617

1718
## Installation
1819

@@ -21,7 +22,7 @@ The REST API documentation can be found on [developer.onebusaway.org](https://de
2122
### Gradle
2223

2324
```kotlin
24-
implementation("org.onebusaway:onebusaway-sdk-kotlin:0.1.0-alpha.66")
25+
implementation("org.onebusaway:onebusaway-sdk-kotlin:0.1.0-alpha.67")
2526
```
2627

2728
### Maven
@@ -30,7 +31,7 @@ implementation("org.onebusaway:onebusaway-sdk-kotlin:0.1.0-alpha.66")
3031
<dependency>
3132
<groupId>org.onebusaway</groupId>
3233
<artifactId>onebusaway-sdk-kotlin</artifactId>
33-
<version>0.1.0-alpha.66</version>
34+
<version>0.1.0-alpha.67</version>
3435
</dependency>
3536
```
3637

build.gradle.kts

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
11
plugins {
2-
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
2+
id("org.jetbrains.dokka") version "2.0.0"
3+
}
4+
5+
repositories {
6+
mavenCentral()
37
}
48

59
allprojects {
610
group = "org.onebusaway"
7-
version = "0.1.0-alpha.66" // x-release-please-version
11+
version = "0.1.0-alpha.67" // x-release-please-version
12+
}
13+
14+
subprojects {
15+
apply(plugin = "org.jetbrains.dokka")
16+
}
17+
18+
// Avoid race conditions between `dokkaHtmlCollector` and `dokkaJavadocJar` tasks
19+
tasks.named("dokkaHtmlCollector").configure {
20+
subprojects.flatMap { it.tasks }
21+
.filter { it.project.name != "onebusaway-sdk-kotlin" && it.name == "dokkaJavadocJar" }
22+
.forEach { mustRunAfter(it) }
823
}

buildSrc/src/main/kotlin/onebusaway-sdk.java.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ configure<SpotlessExtension> {
2121

2222
java {
2323
toolchain {
24-
languageVersion.set(JavaLanguageVersion.of(17))
24+
languageVersion.set(JavaLanguageVersion.of(21))
2525
}
2626
}
2727

buildSrc/src/main/kotlin/onebusaway-sdk.publish.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.vanniktech.maven.publish.JavadocJar
2+
import com.vanniktech.maven.publish.KotlinJvm
13
import com.vanniktech.maven.publish.MavenPublishBaseExtension
24
import com.vanniktech.maven.publish.SonatypeHost
35

@@ -19,6 +21,12 @@ configure<MavenPublishBaseExtension> {
1921
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
2022

2123
coordinates(project.group.toString(), project.name, project.version.toString())
24+
configure(
25+
KotlinJvm(
26+
javadocJar = JavadocJar.Dokka("dokkaHtml"),
27+
sourcesJar = true,
28+
)
29+
)
2230

2331
pom {
2432
name.set("OneBusAway")

onebusaway-sdk-kotlin/build.gradle.kts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,24 @@ plugins {
66
dependencies {
77
api(project(":onebusaway-sdk-kotlin-client-okhttp"))
88
}
9+
10+
// Redefine `dokkaHtml` to:
11+
// - Depend on the root project's task for merging the docs of all the projects
12+
// - Forward that task's output to this task's output
13+
tasks.named("dokkaHtml").configure {
14+
actions.clear()
15+
16+
val dokkaHtmlCollector = rootProject.tasks["dokkaHtmlCollector"]
17+
dependsOn(dokkaHtmlCollector)
18+
19+
val outputDirectory = project.layout.buildDirectory.dir("dokka/html")
20+
doLast {
21+
copy {
22+
from(dokkaHtmlCollector.outputs.files)
23+
into(outputDirectory)
24+
duplicatesStrategy = DuplicatesStrategy.INCLUDE
25+
}
26+
}
27+
28+
outputs.dir(outputDirectory)
29+
}

0 commit comments

Comments
 (0)