From a01077dad3760891b3efa863123d13b7149eac2f Mon Sep 17 00:00:00 2001 From: Dominic Date: Wed, 22 Nov 2023 18:06:35 +0100 Subject: [PATCH] dokka 1.9.10-1 --- .SRCINFO | 12 ++++++------ 0002-embed-plugin-dependencies.patch | 24 +++++++++++------------- PKGBUILD | 12 ++++++------ 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7f4540d..0114e0b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,21 +1,21 @@ pkgbase = dokka pkgdesc = Documentation Engine for Kotlin - pkgver = 1.8.10 + pkgver = 1.9.10 pkgrel = 1 - url = https://kotlin.github.io/dokka/1.8.10/ + url = https://kotlin.github.io/dokka/1.9.10/ arch = any license = Apache - makedepends = gradle7 + makedepends = gradle makedepends = npm depends = freemarker depends = java-environment - source = https://github.com/Kotlin/dokka/archive/refs/tags/v1.8.10.tar.gz + source = https://github.com/Kotlin/dokka/archive/refs/tags/v1.9.10.tar.gz source = 0001-enable-application-plugin.patch source = 0002-embed-plugin-dependencies.patch source = dokka - sha256sums = 53aa1464d4074434f436b388b48ed4bc5bacf33fba5758b4c0d49abbc414a14e + sha256sums = 6ff50037806e140cff4a12b98c8e6631c2aedbd867b04dcc40ade9880c75d0fc sha256sums = 78d2f4fd30508c9b634e22655da275b0db4c5317d71bb3cd746f851702a31d93 - sha256sums = b5f139af1e11ba823865f01383eb5eae873af86fcd86107e6e179076ce1145f4 + sha256sums = bef57356bd152795195100874c918fa27c35407507aa13f08267dce0b0dcc1de sha256sums = 9c7aa9721fe0b2c3cf3831a4d0b1720f13b070734d7be2702f820267ca11e277 pkgname = dokka diff --git a/0002-embed-plugin-dependencies.patch b/0002-embed-plugin-dependencies.patch index 3421eb4..0eee86c 100644 --- a/0002-embed-plugin-dependencies.patch +++ b/0002-embed-plugin-dependencies.patch @@ -1,14 +1,12 @@ ---- runners/cli/build.gradle.kts 2022-08-21 15:44:14.274863135 +0200 -+++ runners/cli/build.gradle.kts 2022-08-21 15:58:28.329169409 +0200 -@@ -10,6 +15,11 @@ - implementation(project(":core")) - implementation(kotlin("stdlib")) - testImplementation(kotlin("test-junit")) -+ -+ val kotlinx_html_version: String by project -+ implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:$kotlinx_html_version") -+ -+ implementation(project(":kotlin-analysis")) - } +--- runners/cli/build.gradle.kts.bak 2023-11-22 17:57:41.923139585 +0100 ++++ runners/cli/build.gradle.kts 2023-11-22 18:04:46.718648023 +0100 +@@ -18,7 +18,9 @@ - tasks { + dependencies { + implementation(projects.core) ++ implementation(projects.subprojects.analysisKotlinApi) + implementation(libs.kotlinx.cli) ++ implementation(libs.kotlinx.html) + + testImplementation(kotlin("test")) + } diff --git a/PKGBUILD b/PKGBUILD index 6fdfbbe..b4b23e8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Dominic Meiser [git at msrd0 dot de] pkgname='dokka' -pkgver=1.8.10 +pkgver=1.9.10 pkgrel=1 pkgdesc='Documentation Engine for Kotlin' url="https://kotlin.github.io/dokka/$pkgver/" @@ -10,15 +10,15 @@ license=('Apache') arch=('any') depends=('freemarker' 'java-environment') -makedepends=('gradle7' 'npm') +makedepends=('gradle' 'npm') source=("https://github.com/Kotlin/dokka/archive/refs/tags/v$pkgver.tar.gz" '0001-enable-application-plugin.patch' '0002-embed-plugin-dependencies.patch' 'dokka') -sha256sums=('53aa1464d4074434f436b388b48ed4bc5bacf33fba5758b4c0d49abbc414a14e' +sha256sums=('6ff50037806e140cff4a12b98c8e6631c2aedbd867b04dcc40ade9880c75d0fc' '78d2f4fd30508c9b634e22655da275b0db4c5317d71bb3cd746f851702a31d93' - 'b5f139af1e11ba823865f01383eb5eae873af86fcd86107e6e179076ce1145f4' + 'bef57356bd152795195100874c918fa27c35407507aa13f08267dce0b0dcc1de' '9c7aa9721fe0b2c3cf3831a4d0b1720f13b070734d7be2702f820267ca11e277') prepare() { @@ -29,8 +29,8 @@ prepare() { build() { cd "$srcdir/dokka-$pkgver" - gradle7 :runners:cli:distTar - gradle7 :plugins:base:jar + gradle :runners:cli:distTar + gradle :plugins:base:jar } package() {