Compare commits

...
Sign in to create a new pull request.

2 commits
main ... 1.9.20

Author SHA1 Message Date
e24e929535
CI: only push on main branch 2024-11-25 18:21:27 +01:00
aa0c85a528
attempt to patch for 1.9.20
Some checks failed
Mirror / mirror (push) Failing after 7m6s
fails to find the subproject, whatever gradle is doing, I have no idea
2024-11-25 18:13:24 +01:00
5 changed files with 39 additions and 40 deletions

View file

@ -1,5 +1,7 @@
name: Mirror name: Mirror
on: [push] on:
push:
branches: [main]
jobs: jobs:
mirror: mirror:

View file

@ -1,9 +1,9 @@
--- runners/cli/build.gradle.kts 2022-08-21 15:44:14.274863135 +0200 --- dokka-runners/runner-cli/build.gradle.kts.bak 2024-11-25 18:02:19.205828622 +0100
+++ runners/cli/build.gradle.kts 2022-08-21 15:44:53.244731374 +0200 +++ dokka-runners/runner-cli/build.gradle.kts 2024-11-25 18:02:49.315906342 +0100
@@ -3,6 +3,11 @@ @@ -8,6 +8,11 @@
id("dokkabuild.kotlin-jvm")
plugins { id("dokkabuild.publish-shadow")
id("com.github.johnrengelman.shadow") alias(libs.plugins.kotlinx.binaryCompatibilityValidator)
+ id("application") + id("application")
+} +}
+ +
@ -11,4 +11,4 @@
+ mainClass.set("org.jetbrains.dokka.MainKt") + mainClass.set("org.jetbrains.dokka.MainKt")
} }
dependencies { overridePublicationArtifactId("dokka-cli")

View file

@ -1,10 +1,11 @@
--- runners/cli/build.gradle.kts.bak 2023-11-22 17:57:41.923139585 +0100 --- dokka-runners/runner-cli/build.gradle.kts.bak 2024-11-25 18:04:03.479431056 +0100
+++ runners/cli/build.gradle.kts 2023-11-22 18:04:46.718648023 +0100 +++ dokka-runners/runner-cli/build.gradle.kts 2024-11-25 18:06:05.606385737 +0100
@@ -18,7 +18,9 @@ @@ -18,8 +18,10 @@
overridePublicationArtifactId("dokka-cli")
dependencies { dependencies {
implementation(projects.core) implementation("org.jetbrains.dokka:dokka-core")
+ implementation(projects.subprojects.analysisKotlinApi) + implementation("org.jetbrains.dokka:analysis-kotlin-api")
implementation(libs.kotlinx.cli) implementation(libs.kotlinx.cli)
+ implementation(libs.kotlinx.html) + implementation(libs.kotlinx.html)

View file

@ -1,24 +1,19 @@
--- settings.gradle.kts.bak 2023-11-22 18:20:42.369002363 +0100 --- settings.gradle.kts.bak 2024-11-25 18:06:58.849846016 +0100
+++ settings.gradle.kts 2023-11-22 18:21:00.853981373 +0100 +++ settings.gradle.kts 2024-11-25 18:07:14.506550205 +0100
@@ -54,10 +54,6 @@ @@ -55,7 +55,6 @@
}
} }
-plugins { plugins {
- `gradle-enterprise` - `gradle-enterprise`
-} id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
- }
include(
":core", @@ -94,16 +93,6 @@
":core:test-api", ":dokka-subprojects:plugin-versioning",
@@ -101,17 +97,4 @@
":docs-developer",
) )
-val isCiBuild = System.getenv("GITHUB_ACTIONS") != null || System.getenv("TEAMCITY_VERSION") != null -val isCiBuild = System.getenv("GITHUB_ACTIONS") != null || System.getenv("TEAMCITY_VERSION") != null
- -
-
-
-gradleEnterprise { -gradleEnterprise {
- buildScan { - buildScan {
- termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceUrl = "https://gradle.com/terms-of-service"
@ -27,5 +22,6 @@
- } - }
-} -}
- -
- // This hack is required for included build support.
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") // The name of the published artifact is `dokka-core`, but the module is named `core`.
// For some reason, dependency substitution doesn't work in this case. Maybe we fall under one of the unsupported

View file

@ -2,7 +2,7 @@
# Maintainer: Dominic Meiser [git at msrd0 dot de] # Maintainer: Dominic Meiser [git at msrd0 dot de]
pkgname='dokka' pkgname='dokka'
pkgver=1.9.10 pkgver=1.9.20
pkgrel=1 pkgrel=1
pkgdesc='Documentation Engine for Kotlin' pkgdesc='Documentation Engine for Kotlin'
url="https://kotlin.github.io/dokka/$pkgver/" url="https://kotlin.github.io/dokka/$pkgver/"
@ -10,17 +10,17 @@ license=('Apache')
arch=('any') arch=('any')
depends=('freemarker' 'java-environment') depends=('freemarker' 'java-environment')
makedepends=('gradle' 'jdk8-openjdk' 'npm') makedepends=('gradle' 'jdk11-openjdk' 'npm')
source=("https://github.com/Kotlin/dokka/archive/refs/tags/v$pkgver.tar.gz" source=("https://github.com/Kotlin/dokka/archive/refs/tags/v$pkgver.tar.gz"
'0001-enable-application-plugin.patch' '0001-enable-application-plugin.patch'
'0002-embed-plugin-dependencies.patch' '0002-embed-plugin-dependencies.patch'
'0003-disable-gradle-enterprise.patch' '0003-disable-gradle-enterprise.patch'
'dokka') 'dokka')
sha256sums=('6ff50037806e140cff4a12b98c8e6631c2aedbd867b04dcc40ade9880c75d0fc' sha256sums=('c1d2e9b0547c9a8023f0fb81e8d7ceabc25a11a1de20e387010217a79ade4ac2'
'78d2f4fd30508c9b634e22655da275b0db4c5317d71bb3cd746f851702a31d93' '022deed27194a1cca2b981b1cd941828a4f1446c91af1f8339a4adfb983667b3'
'bef57356bd152795195100874c918fa27c35407507aa13f08267dce0b0dcc1de' 'e4a33df4d96234ef7be45811b6422c6adbd8749d0ffb505631912f6fe7e12d34'
'2bac7e5f944f4f2342eaabff4b60666f3681dd945ff96e8bb56491c6dda4deb8' 'a833d13aad3b30d5718cc952dcdbf26dfb023ebb3282d20f14bb9889f195561f'
'9c7aa9721fe0b2c3cf3831a4d0b1720f13b070734d7be2702f820267ca11e277') '9c7aa9721fe0b2c3cf3831a4d0b1720f13b070734d7be2702f820267ca11e277')
prepare() { prepare() {
@ -36,14 +36,14 @@ prepare() {
build() { build() {
cd "$srcdir/dokka-$pkgver" cd "$srcdir/dokka-$pkgver"
JAVA_HOME=/usr/lib/jvm/java-8-openjdk gradle :runners:cli:distTar JAVA_HOME=/usr/lib/jvm/java-11-openjdk gradle :dokka-runners:runner-cli:distTar
JAVA_HOME=/usr/lib/jvm/java-8-openjdk gradle :plugins:base:jar JAVA_HOME=/usr/lib/jvm/java-11-openjdk gradle :plugins:base:jar
} }
package() { package() {
cd "$srcdir/dokka-$pkgver" cd "$srcdir/dokka-$pkgver"
mkdir -p "$pkgdir/usr/lib/dokka" mkdir -p "$pkgdir/usr/lib/dokka"
tar xf "runners/cli/build/distributions/cli-$pkgver.tar" --strip-components=1 -C "$pkgdir/usr/lib/dokka/" tar xf "dokka-runners/runner-cli/build/distributions/cli-$pkgver.tar" --strip-components=1 -C "$pkgdir/usr/lib/dokka/"
rm "$pkgdir/usr/lib/dokka/bin/cli.bat" rm "$pkgdir/usr/lib/dokka/bin/cli.bat"
install -Dm644 "plugins/base/build/libs/base-$pkgver.jar" "$pkgdir/usr/lib/dokka/plugins/base.jar" install -Dm644 "plugins/base/build/libs/base-$pkgver.jar" "$pkgdir/usr/lib/dokka/plugins/base.jar"
install -Dm755 ../dokka -t "$pkgdir/usr/bin/" install -Dm755 ../dokka -t "$pkgdir/usr/bin/"