patch away appendReproducibleNewLine
All checks were successful
Mirror / mirror (push) Successful in 9m26s

it worked locally for me before, but CI complained
This commit is contained in:
Dominic 2024-11-25 18:19:53 +01:00
parent 945e2cb4e7
commit f42a8b5a77
Signed by: msrd0
GPG key ID: AAF7C8430CA3345D
3 changed files with 31 additions and 2 deletions

View file

@ -6,7 +6,7 @@ pkgbase = dokka
arch = any arch = any
license = Apache license = Apache
makedepends = gradle makedepends = gradle
makedepends = jre8-openjdk-headless makedepends = jdk8-openjdk
makedepends = npm makedepends = npm
depends = freemarker depends = freemarker
depends = java-environment depends = java-environment
@ -14,11 +14,13 @@ pkgbase = dokka
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 = 0003-disable-gradle-enterprise.patch
source = 0004-fix-unresolved-reference-appendReproducibleNewLine.patch
source = dokka source = dokka
sha256sums = 6ff50037806e140cff4a12b98c8e6631c2aedbd867b04dcc40ade9880c75d0fc sha256sums = 6ff50037806e140cff4a12b98c8e6631c2aedbd867b04dcc40ade9880c75d0fc
sha256sums = 78d2f4fd30508c9b634e22655da275b0db4c5317d71bb3cd746f851702a31d93 sha256sums = 78d2f4fd30508c9b634e22655da275b0db4c5317d71bb3cd746f851702a31d93
sha256sums = bef57356bd152795195100874c918fa27c35407507aa13f08267dce0b0dcc1de sha256sums = bef57356bd152795195100874c918fa27c35407507aa13f08267dce0b0dcc1de
sha256sums = 2bac7e5f944f4f2342eaabff4b60666f3681dd945ff96e8bb56491c6dda4deb8 sha256sums = 2bac7e5f944f4f2342eaabff4b60666f3681dd945ff96e8bb56491c6dda4deb8
sha256sums = 53723fe300fad66e174f582e08040406978c064beb1e3925be04deea7bbff206
sha256sums = 9c7aa9721fe0b2c3cf3831a4d0b1720f13b070734d7be2702f820267ca11e277 sha256sums = 9c7aa9721fe0b2c3cf3831a4d0b1720f13b070734d7be2702f820267ca11e277
pkgname = dokka pkgname = dokka

View file

@ -0,0 +1,24 @@
--- runners/maven-plugin/build.gradle.kts.bak 2024-11-25 18:17:09.331346014 +0100
+++ runners/maven-plugin/build.gradle.kts 2024-11-25 18:18:00.384807178 +0100
@@ -2,7 +2,6 @@
* Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
*/
-import org.gradle.kotlin.dsl.support.appendReproducibleNewLine
import org.jetbrains.registerDokkaArtifactPublication
plugins {
@@ -78,11 +77,11 @@
buildString {
val lines = pluginHelpProperties.readText().lines().iterator()
// the first line is a descriptive comment
- appendReproducibleNewLine(lines.next())
+ append(lines.next()).append("\n")
// the second line is the timestamp, which should be ignored
lines.next()
// the remaining lines are properties
- lines.forEach { appendReproducibleNewLine(it) }
+ lines.forEach { append(it).append("\n") }
}
)
}

View file

@ -16,11 +16,13 @@ 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'
'0004-fix-unresolved-reference-appendReproducibleNewLine.patch'
'dokka') 'dokka')
sha256sums=('6ff50037806e140cff4a12b98c8e6631c2aedbd867b04dcc40ade9880c75d0fc' sha256sums=('6ff50037806e140cff4a12b98c8e6631c2aedbd867b04dcc40ade9880c75d0fc'
'78d2f4fd30508c9b634e22655da275b0db4c5317d71bb3cd746f851702a31d93' '78d2f4fd30508c9b634e22655da275b0db4c5317d71bb3cd746f851702a31d93'
'bef57356bd152795195100874c918fa27c35407507aa13f08267dce0b0dcc1de' 'bef57356bd152795195100874c918fa27c35407507aa13f08267dce0b0dcc1de'
'2bac7e5f944f4f2342eaabff4b60666f3681dd945ff96e8bb56491c6dda4deb8' '2bac7e5f944f4f2342eaabff4b60666f3681dd945ff96e8bb56491c6dda4deb8'
'53723fe300fad66e174f582e08040406978c064beb1e3925be04deea7bbff206'
'9c7aa9721fe0b2c3cf3831a4d0b1720f13b070734d7be2702f820267ca11e277') '9c7aa9721fe0b2c3cf3831a4d0b1720f13b070734d7be2702f820267ca11e277')
prepare() { prepare() {
@ -28,7 +30,8 @@ prepare() {
for patch in \ for patch in \
'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' \
'0004-fix-unresolved-reference-appendReproducibleNewLine.patch'
do do
patch -N -p0 -i "../$patch" patch -N -p0 -i "../$patch"
done done