beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-25 09:00:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'gradle8'

Browse source
This commit is contained in:
crschnick 2023-04-10 15:22:07 +00:00
parent 6440062efd
commit 0f7effef06
3 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dist/build.gradle vendored
View file

@ -1,23 +1,12 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.netflix.nebula:gradle-ospackage-plugin:9.1.1'
}
}
plugins { 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.moditect.gradleplugin" version "1.0.0-rc3"
id "org.asciidoctor.jvm.convert" version "3.3.2" 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 { repositories {
mavenCentral() mavenCentral()
} }
@ -52,6 +41,7 @@ if (rootProject.fullVersion) {
apply from: 'portable.gradle' apply from: 'portable.gradle'
apply from: 'proguard.gradle' apply from: 'proguard.gradle'
apply from: 'jreleaser.gradle' apply from: 'jreleaser.gradle'
apply from: 'choco.gradle'
if (org.gradle.internal.os.OperatingSystem.current().isLinux()) { if (org.gradle.internal.os.OperatingSystem.current().isLinux()) {
apply from: 'linux_packages.gradle' apply from: 'linux_packages.gradle'

4
gradle/gradle_scripts/extension.gradle
View file

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

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists