disable gradle enterprise plugin; add jre8 dependency for weird jetbrains plugins
Some checks failed
Mirror / mirror (push) Failing after 1m38s

This commit is contained in:
Dominic 2023-11-22 18:25:21 +01:00
parent a01077dad3
commit 0e591e20a9
Signed by: msrd0
GPG key ID: DCC8C247452E98F9
3 changed files with 44 additions and 3 deletions

View file

@ -6,16 +6,19 @@ pkgbase = dokka
arch = any arch = any
license = Apache license = Apache
makedepends = gradle makedepends = gradle
makedepends = java-runtime-headless=8
makedepends = npm makedepends = npm
depends = freemarker depends = freemarker
depends = java-environment depends = java-environment
source = https://github.com/Kotlin/dokka/archive/refs/tags/v1.9.10.tar.gz source = https://github.com/Kotlin/dokka/archive/refs/tags/v1.9.10.tar.gz
source = 0001-enable-application-plugin.patch source = 0001-enable-application-plugin.patch
source = 0002-embed-plugin-dependencies.patch source = 0002-embed-plugin-dependencies.patch
source = 0003-disable-gradle-enterprise.patch
source = dokka source = dokka
sha256sums = 6ff50037806e140cff4a12b98c8e6631c2aedbd867b04dcc40ade9880c75d0fc sha256sums = 6ff50037806e140cff4a12b98c8e6631c2aedbd867b04dcc40ade9880c75d0fc
sha256sums = 78d2f4fd30508c9b634e22655da275b0db4c5317d71bb3cd746f851702a31d93 sha256sums = 78d2f4fd30508c9b634e22655da275b0db4c5317d71bb3cd746f851702a31d93
sha256sums = bef57356bd152795195100874c918fa27c35407507aa13f08267dce0b0dcc1de sha256sums = bef57356bd152795195100874c918fa27c35407507aa13f08267dce0b0dcc1de
sha256sums = 2bac7e5f944f4f2342eaabff4b60666f3681dd945ff96e8bb56491c6dda4deb8
sha256sums = 9c7aa9721fe0b2c3cf3831a4d0b1720f13b070734d7be2702f820267ca11e277 sha256sums = 9c7aa9721fe0b2c3cf3831a4d0b1720f13b070734d7be2702f820267ca11e277
pkgname = dokka pkgname = dokka

View file

@ -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")

View file

@ -10,21 +10,28 @@ license=('Apache')
arch=('any') arch=('any')
depends=('freemarker' 'java-environment') 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" 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'
'dokka') 'dokka')
sha256sums=('6ff50037806e140cff4a12b98c8e6631c2aedbd867b04dcc40ade9880c75d0fc' sha256sums=('6ff50037806e140cff4a12b98c8e6631c2aedbd867b04dcc40ade9880c75d0fc'
'78d2f4fd30508c9b634e22655da275b0db4c5317d71bb3cd746f851702a31d93' '78d2f4fd30508c9b634e22655da275b0db4c5317d71bb3cd746f851702a31d93'
'bef57356bd152795195100874c918fa27c35407507aa13f08267dce0b0dcc1de' 'bef57356bd152795195100874c918fa27c35407507aa13f08267dce0b0dcc1de'
'2bac7e5f944f4f2342eaabff4b60666f3681dd945ff96e8bb56491c6dda4deb8'
'9c7aa9721fe0b2c3cf3831a4d0b1720f13b070734d7be2702f820267ca11e277') '9c7aa9721fe0b2c3cf3831a4d0b1720f13b070734d7be2702f820267ca11e277')
prepare() { prepare() {
cd "$srcdir/dokka-$pkgver" cd "$srcdir/dokka-$pkgver"
patch -N -p0 -i ../0001-enable-application-plugin.patch for patch in \
patch -N -p0 -i ../0002-embed-plugin-dependencies.patch '0001-enable-application-plugin.patch' \
'0002-embed-plugin-dependencies.patch' \
'0003-disable-gradle-enterprise.patch'
do
patch -N -p0 -i "../$patch"
done
} }
build() { build() {