From 0e591e20a9e079a836056affe20ece6cc743e355 Mon Sep 17 00:00:00 2001 From: Dominic Date: Wed, 22 Nov 2023 18:25:21 +0100 Subject: [PATCH] disable gradle enterprise plugin; add jre8 dependency for weird jetbrains plugins --- .SRCINFO | 3 +++ 0003-disable-gradle-enterprise.patch | 31 ++++++++++++++++++++++++++++ PKGBUILD | 13 +++++++++--- 3 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 0003-disable-gradle-enterprise.patch diff --git a/.SRCINFO b/.SRCINFO index 0114e0b..0cbe775 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -6,16 +6,19 @@ pkgbase = dokka arch = any license = Apache makedepends = gradle + makedepends = java-runtime-headless=8 makedepends = npm depends = freemarker depends = java-environment 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 = 0003-disable-gradle-enterprise.patch source = dokka sha256sums = 6ff50037806e140cff4a12b98c8e6631c2aedbd867b04dcc40ade9880c75d0fc sha256sums = 78d2f4fd30508c9b634e22655da275b0db4c5317d71bb3cd746f851702a31d93 sha256sums = bef57356bd152795195100874c918fa27c35407507aa13f08267dce0b0dcc1de + sha256sums = 2bac7e5f944f4f2342eaabff4b60666f3681dd945ff96e8bb56491c6dda4deb8 sha256sums = 9c7aa9721fe0b2c3cf3831a4d0b1720f13b070734d7be2702f820267ca11e277 pkgname = dokka diff --git a/0003-disable-gradle-enterprise.patch b/0003-disable-gradle-enterprise.patch new file mode 100644 index 0000000..8a5267d --- /dev/null +++ b/0003-disable-gradle-enterprise.patch @@ -0,0 +1,31 @@ +--- settings.gradle.kts.bak 2023-11-22 18:20:42.369002363 +0100 ++++ settings.gradle.kts 2023-11-22 18:21:00.853981373 +0100 +@@ -54,10 +54,6 @@ + } + } + +-plugins { +- `gradle-enterprise` +-} +- + include( + ":core", + ":core:test-api", +@@ -101,17 +97,4 @@ + ":docs-developer", + ) + +-val isCiBuild = System.getenv("GITHUB_ACTIONS") != null || System.getenv("TEAMCITY_VERSION") != null +- +- +- +-gradleEnterprise { +- buildScan { +- termsOfServiceUrl = "https://gradle.com/terms-of-service" +- termsOfServiceAgree = "yes" +- publishAlwaysIf(isCiBuild) +- } +-} +- +- + enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") diff --git a/PKGBUILD b/PKGBUILD index b4b23e8..30cf2cb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,21 +10,28 @@ license=('Apache') arch=('any') depends=('freemarker' 'java-environment') -makedepends=('gradle' 'npm') +makedepends=('gradle' 'java-runtime-headless=8' 'npm') source=("https://github.com/Kotlin/dokka/archive/refs/tags/v$pkgver.tar.gz" '0001-enable-application-plugin.patch' '0002-embed-plugin-dependencies.patch' + '0003-disable-gradle-enterprise.patch' 'dokka') sha256sums=('6ff50037806e140cff4a12b98c8e6631c2aedbd867b04dcc40ade9880c75d0fc' '78d2f4fd30508c9b634e22655da275b0db4c5317d71bb3cd746f851702a31d93' 'bef57356bd152795195100874c918fa27c35407507aa13f08267dce0b0dcc1de' + '2bac7e5f944f4f2342eaabff4b60666f3681dd945ff96e8bb56491c6dda4deb8' '9c7aa9721fe0b2c3cf3831a4d0b1720f13b070734d7be2702f820267ca11e277') prepare() { cd "$srcdir/dokka-$pkgver" - patch -N -p0 -i ../0001-enable-application-plugin.patch - patch -N -p0 -i ../0002-embed-plugin-dependencies.patch + for patch in \ + '0001-enable-application-plugin.patch' \ + '0002-embed-plugin-dependencies.patch' \ + '0003-disable-gradle-enterprise.patch' + do + patch -N -p0 -i "../$patch" + done } build() {