Upgrade to 4.2.3, migrate to micronaut-starter

2 files changed, 25 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0e8effc04541..3cdfacf2c178 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = micronaut
 	pkgdesc = Application Framework
-	pkgver = 1.3.5
+	pkgver = 4.2.3
 	pkgrel = 1
-	url = https://github.com/micronaut-projects/micronaut-core
+	url = https://github.com/micronaut-projects/micronaut-starter
 	arch = x86_64
 	license = Apache
+	makedepends = unzip
 	depends = java-environment>=8
-	source = https://github.com/micronaut-projects/micronaut-core/archive/v1.2.9.tar.gz
-	sha512sums = e3d84e36157eb6b9156d0037a415f6c748b63bcf94ad610b58a1384b977feee728bd94ef520a59fcc3096350c6cef1702bdcc4a6beb0053bd5f701f231c9c43b
+	source = https://github.com/micronaut-projects/micronaut-starter/archive/v4.2.3.tar.gz
+	sha512sums = f64b75fb559f8bd29a54cfdd2fd7b0e47c389dff750f88711f6f31e6e3152f0a7d8702afd6f584ce9af2902df308daff26c85fb0c33b2088d077d66bed1ec75e
 
 pkgname = micronaut
-
diff --git a/PKGBUILD b/PKGBUILD
index 0d99d34da031..db9f0cde511e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,19 @@
 # Maintainer: Sven-Hendrik Haase <svenstaro@gmail.com>
 # Maintainer: Robert Gonciarz <goncairz (malpa) gmail (kropka) com>
 # Maintainer: Kevin Baxmann <kvbx@kvbx.de>
+# Maintainer: Enzo Mallard <enzo+aur@mallard.ml>
 
 pkgname=micronaut
-pkgver=1.3.5
+pkgver=4.2.3
 pkgrel=1
 pkgdesc="Application Framework"
 arch=('x86_64')
-url="https://github.com/micronaut-projects/micronaut-core"
+url="https://github.com/micronaut-projects/micronaut-starter"
 license=(Apache)
 depends=('java-environment>=8')
-source=(https://github.com/micronaut-projects/micronaut-core/archive/v${pkgver}.tar.gz)
-sha512sums=('e3d84e36157eb6b9156d0037a415f6c748b63bcf94ad610b58a1384b977feee728bd94ef520a59fcc3096350c6cef1702bdcc4a6beb0053bd5f701f231c9c43b')
+makedepends=('unzip')
+source=(https://github.com/micronaut-projects/micronaut-starter/archive/v${pkgver}.tar.gz)
+sha512sums=('f64b75fb559f8bd29a54cfdd2fd7b0e47c389dff750f88711f6f31e6e3152f0a7d8702afd6f584ce9af2902df308daff26c85fb0c33b2088d077d66bed1ec75e')
 
 build() {
 
@@ -20,7 +22,7 @@ build() {
       tput bold
       echo
       echo "Building may have failed due to an incompatible JDK."
-      echo "Please set JAVA_HOME to a JDK compatible with gradle 6.1 (between 8 and 13)."
+      echo "Please set JAVA_HOME to a JDK compatible with gradle 8.3 (between 8 and 20)."
       echo "(e.g. install 'jdk8-openjdk' and run 'archlinux-java set java-8-openjdk')"
       echo "After building the package you may set it back to a newer version"
       echo
@@ -30,19 +32,24 @@ build() {
 
   trap build_failed EXIT
 
-  cd "$srcdir/micronaut-core-$pkgver"
-  ./gradlew cli:fatJar
+  cd "$srcdir/micronaut-starter-$pkgver"
+  ./gradlew micronaut-cli:assembleDist
+
+  unzip "starter-cli/build/distributions/$pkgname-cli-$pkgver.zip"
 }
 
 package() {
-  cd "$srcdir/micronaut-core-$pkgver"
+  cd "$srcdir/micronaut-starter-$pkgver"
+
+  install -dm755 "$pkgdir"/usr/lib/$pkgname/lib
+  install -Dm644 -t "$pkgdir"/usr/lib/$pkgname/lib "$pkgname-cli-$pkgver"/lib/*
+  install -Dm755 -t "$pkgdir"/usr/bin/ "$pkgname-cli-$pkgver/bin/mn"
 
-  mkdir -p "$pkgdir"/usr/bin
-  mkdir -p "$pkgdir"/usr/lib/micronaut
-  cp -r cli/build/* "$pkgdir"/usr/lib/micronaut
+  install -Dm644 "$pkgname-cli-$pkgver/bin/mn_completion" "$pkgdir"/usr/share/zsh/site-functions/_$pkgname
+  install -Dm644 "$pkgname-cli-$pkgver/bin/mn_completion" "$pkgdir"/usr/share/bash-completion/completions/$pkgname
+  install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" "$pkgname-cli-$pkgver/LICENSE"
 
-  mv "$pkgdir"/usr/lib/micronaut/bin/mn "$pkgdir"/usr/bin/mn
-  sed -i "s|^APP_HOME.*$|APP_HOME=/usr/lib/micronaut|" "$pkgdir"/usr/bin/mn
+  sed -i "s|^APP_HOME.*$|APP_HOME=/usr/lib/$pkgname|" "$pkgdir"/usr/bin/mn
 }
 
 # vim:set ts=2 sw=2 et: