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
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:
with:
ruby-version: '3.2'
- name: Build Dokka HTML
run: ./gradlew dokkaHtmlMultiModule
run: ./gradlew :dokkaGenerate
- name: Setup docs folder
run: |
mkdir -p build/docs
mkdir -p build/docs/api
echo "kdriver.dev" > build/docs/CNAME
cp -r build/dokka/htmlMultiModule/* build/docs/api
cp -r build/dokka/html/* build/docs/api
cp -r docs/* build/docs
cat README.md >> build/docs/index.md
- name: Generate sitemap
Expand Down
4 changes: 4 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ allprojects {
}

dependencies {
dokka(projects.cdp)
dokka(projects.core)
dokka(projects.opentelemetry)

kover(projects.cdp)
kover(projects.core)
kover(projects.opentelemetry)
Expand Down
2 changes: 1 addition & 1 deletion cdp-generate/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repositories {

kotlin {
dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.4.20")
implementation("com.squareup:kotlinpoet:2.2.0")
}
}
Expand Down
13 changes: 8 additions & 5 deletions cdp/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import com.vanniktech.maven.publish.JavadocJar
import com.vanniktech.maven.publish.KotlinMultiplatform
import com.vanniktech.maven.publish.SourcesJar

plugins {
alias(libs.plugins.multiplatform)
alias(libs.plugins.serialization)
Expand All @@ -10,7 +14,10 @@ plugins {
}

mavenPublishing {
publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL)
// Empty javadoc jars: the full Dokka site is published on kdriver.dev, and embedding it
// in every platform publication would blow the Maven Central size limits.
configure(KotlinMultiplatform(javadocJar = JavadocJar.Empty(), sourcesJar = SourcesJar.Sources()))
publishToMavenCentral()
signAllPublications()
pom {
name.set("cdp")
Expand Down Expand Up @@ -39,20 +46,16 @@ mavenPublishing {
kotlin {
// Tiers are in accordance with <https://kotlinlang.org/docs/native-target-support.html>
// Tier 1
macosX64()
macosArm64()
iosSimulatorArm64()
iosX64()

// Tier 2
linuxX64()
linuxArm64()
watchosSimulatorArm64()
watchosX64()
watchosArm32()
watchosArm64()
tvosSimulatorArm64()
tvosX64()
tvosArm64()
iosArm64()

Expand Down
10 changes: 8 additions & 2 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import com.vanniktech.maven.publish.JavadocJar
import com.vanniktech.maven.publish.KotlinMultiplatform
import com.vanniktech.maven.publish.SourcesJar

plugins {
alias(libs.plugins.multiplatform)
alias(libs.plugins.serialization)
Expand All @@ -9,7 +13,10 @@ plugins {
}

mavenPublishing {
publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL)
// Empty javadoc jars: the full Dokka site is published on kdriver.dev, and embedding it
// in every platform publication would blow the Maven Central size limits.
configure(KotlinMultiplatform(javadocJar = JavadocJar.Empty(), sourcesJar = SourcesJar.Sources()))
publishToMavenCentral()
signAllPublications()
pom {
name.set("core")
Expand Down Expand Up @@ -37,7 +44,6 @@ mavenPublishing {

kotlin {
// Native targets
macosX64()
macosArm64()
linuxX64()
linuxArm64()
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
kotlin.code.style=official
kotlin.native.ignoreDisabledTargets=true
kotlin.daemon.jvmargs=-Xmx2g -Xms2g
org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[versions]
kotlin = "2.3.0"
kover = "0.8.3"
kotlin = "2.4.20"
kover = "0.9.11"
detekt = "1.23.8"
dokka = "2.0.0"
ksp = "2.3.4"
maven = "0.30.0"
dokka = "2.2.0"
ksp = "2.3.12"
maven = "0.37.0"
ktor = "3.4.0"
mockk = "1.13.12"
jsoup = "1.16.2"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
15 changes: 6 additions & 9 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

86 changes: 52 additions & 34 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion opentelemetry/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import com.vanniktech.maven.publish.JavadocJar
import com.vanniktech.maven.publish.KotlinMultiplatform
import com.vanniktech.maven.publish.SourcesJar

plugins {
alias(libs.plugins.multiplatform)
alias(libs.plugins.serialization)
Expand All @@ -9,7 +13,10 @@ plugins {
}

mavenPublishing {
publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL)
// Empty javadoc jars: the full Dokka site is published on kdriver.dev, and embedding it
// in every platform publication would blow the Maven Central size limits.
configure(KotlinMultiplatform(javadocJar = JavadocJar.Empty(), sourcesJar = SourcesJar.Sources()))
publishToMavenCentral()
signAllPublications()
pom {
name.set("opentelemetry")
Expand Down
Loading