summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--Makefile2
-rw-r--r--PKGBUILD24
3 files changed, 15 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5351edf5130f..fed4e31e52ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,12 @@
pkgbase = ktlint
pkgdesc = An anti-bikeshedding Kotlin linter with built-in formatter
- pkgver = 0.48.2
+ pkgver = 0.49.0
pkgrel = 1
url = https://ktlint.github.io/
arch = any
license = MIT
- depends = java-runtime
- source = ktlint-0.48.2::https://github.com/pinterest/ktlint/releases/download/0.48.2/ktlint
- source = https://raw.githubusercontent.com/pinterest/ktlint/0.48.2/LICENSE
- source = ktlint-0.48.2.asc::https://github.com/pinterest/ktlint/releases/download/0.48.2/ktlint.asc
- validpgpkeys = ADBC987D1A7B91DB6B0AAA81995EFBF4A3D20BEB
- sha256sums = c6f392e8b788d0eac4e58845d6ab2a19435f2a2c63c4482667688fefd809ca1f
- sha256sums = b45bdb3357e761d4b1300470833cf5e5e9fafc32a5f98efef214ba926b0120d5
+ depends = java-runtime>=1.8
+ source = ktlint-0.49.0::git+https://github.com/pinterest/ktlint.git#tag=0.49.0
sha256sums = SKIP
pkgname = ktlint
diff --git a/Makefile b/Makefile
index 059c9af31da3..f0612f3987e5 100644
--- a/Makefile
+++ b/Makefile
@@ -9,4 +9,4 @@ package: PKGBUILD .SRCINFO
all: package
clean:
- rm -Rv .SRCINFO *.tar.* src/ pkg/ 2> /dev/null || true
+ rm -fRv .SRCINFO *.tar.* ktlint-*/ src/ pkg/ *.asc 2> /dev/null || true
diff --git a/PKGBUILD b/PKGBUILD
index 6c88f235c0aa..b7f9ff615f9a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,26 +3,24 @@
# Contributor: p2k <uni-ulm.de: Patrick.Schneider>
pkgname=ktlint
-pkgver=0.48.2
+pkgver=0.49.0
pkgrel=1
pkgdesc="An anti-bikeshedding Kotlin linter with built-in formatter"
arch=('any')
url="https://ktlint.github.io/"
license=('MIT')
-depends=('java-runtime')
+depends=('java-runtime>=1.8')
# See: https://github.com/pinterest/ktlint#installation
-validpgpkeys=(ADBC987D1A7B91DB6B0AAA81995EFBF4A3D20BEB)
-source=(ktlint-${pkgver}::https://github.com/pinterest/ktlint/releases/download/${pkgver}/ktlint
- https://raw.githubusercontent.com/pinterest/ktlint/${pkgver}/LICENSE
- ktlint-${pkgver}.asc::https://github.com/pinterest/ktlint/releases/download/${pkgver}/ktlint.asc)
-sha256sums=('e0647f930f48583b35b7d52133119a3e5efdd9cf57384847bfe6241544fd0342'
- 'b45bdb3357e761d4b1300470833cf5e5e9fafc32a5f98efef214ba926b0120d5'
- 'SKIP')
+source=(ktlint-${pkgver}::"git+https://github.com/pinterest/ktlint.git#tag=${pkgver}")
+sha256sums=('SKIP')
-package() {
- cd "${srcdir}"
+build() {
+ cd "ktlint-${pkgver}"
+ ./gradlew --no-configuration-cache --no-scan --no-daemon -Pktlint.publication.signing.enable=false shadowJarExecutable
+}
- install -D -m755 ktlint-${pkgver} "${pkgdir}/usr/bin/ktlint"
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/ktlint/LICENSE"
+package() {
+ install -D -m755 "${srcdir}/ktlint-${pkgver}/ktlint-cli/build/run/ktlint" "${pkgdir}/usr/bin/ktlint"
+ install -D -m644 "${srcdir}/ktlint-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/ktlint/LICENSE"
}