Merge branch 'gradle8'

dist/build.gradle

@@ -1,23 +1,12 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.netflix.nebula:gradle-ospackage-plugin:9.1.1'
-    }
-}
 
 plugins {
-    id 'org.beryx.jlink' version '2.25.0'
+    id 'org.beryx.jlink' version '2.26.0'
     id "org.moditect.gradleplugin" version "1.0.0-rc3"
     id "org.asciidoctor.jvm.convert" version "3.3.2"
-    id 'org.jreleaser' version '1.3.1'
+    id 'org.jreleaser' version '1.5.1'
+    id("com.netflix.nebula.ospackage") version "11.2.0"
 }
 
-apply plugin: 'nebula.ospackage'
-apply plugin: 'nebula.deb'
-apply plugin: 'nebula.rpm'
-
 repositories {
     mavenCentral()
 }
@@ -52,6 +41,7 @@ if (rootProject.fullVersion) {
     apply from: 'portable.gradle'
     apply from: 'proguard.gradle'
     apply from: 'jreleaser.gradle'
+    apply from: 'choco.gradle'
 
     if (org.gradle.internal.os.OperatingSystem.current().isLinux()) {
         apply from: 'linux_packages.gradle'

gradle/gradle_scripts/extension.gradle

@@ -8,6 +8,8 @@ copyRuntimeLibs.dependsOn(addDependenciesModuleInfo)
 jar.dependsOn(copyRuntimeLibs)
 
 def dev = tasks.register('createDevOutput', Copy) {
+    mustRunAfter copyRuntimeLibs, jar
+
     if (project.allExtensions.contains(project)) {
         var source = "${project.jar.destinationDirectory.get()}"
         from source
@@ -17,6 +19,8 @@ def dev = tasks.register('createDevOutput', Copy) {
 jar.finalizedBy(dev)
 
 tasks.register('createExtOutput', Copy) {
+    mustRunAfter copyRuntimeLibs, jar
+
     if (!file("${project.jar.destinationDirectory.get()}_prod").exists()) {
         copy {
             from "${project.jar.destinationDirectory.get()}"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists