From e2e68201acfe012010d8ca819855d21259aa6fcc Mon Sep 17 00:00:00 2001 From: p2vman Date: Mon, 17 Feb 2025 20:11:47 +0200 Subject: [PATCH] Ahhh gradle :| --- base/build.gradle | 6 +++++- boungecord/build.gradle | 5 +++-- boungecord/src/main/resources/bungee.yml | 2 +- build.gradle | 14 +++++++++++++- gradle.properties | 1 + spigot/build.gradle | 5 +++-- spigot/src/main/resources/plugin.yml | 2 +- velocity/build.gradle | 5 +++-- 8 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 gradle.properties diff --git a/base/build.gradle b/base/build.gradle index e5f8960..ed2b4f2 100644 --- a/base/build.gradle +++ b/base/build.gradle @@ -2,8 +2,12 @@ plugins { id 'java' } +ext { + version = "1.5" +} + group = 'io.github.p2vman' -version = '1.4' +version = project.findProperty("version") repositories { mavenCentral() diff --git a/boungecord/build.gradle b/boungecord/build.gradle index 5b5a959..6e3ee6e 100644 --- a/boungecord/build.gradle +++ b/boungecord/build.gradle @@ -1,7 +1,8 @@ apply plugin: 'java' -group = 'org.eg4rerer' -version = '1.4' +evaluationDependsOn(':base') +group = 'org.eptalist' +version = project.findProperty("version") repositories { mavenCentral() diff --git a/boungecord/src/main/resources/bungee.yml b/boungecord/src/main/resources/bungee.yml index cc4b05c..28a1161 100644 --- a/boungecord/src/main/resources/bungee.yml +++ b/boungecord/src/main/resources/bungee.yml @@ -1,3 +1,3 @@ name: EptaList -version: '1.4' +version: '${version}' main: org.eptalist.bounge.Boungecord \ No newline at end of file diff --git a/build.gradle b/build.gradle index 47cc5a8..dafd15c 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,11 @@ allprojects { } } -version = "1.4" +version = project.findProperty("version") + +ext { + +} task mergePlugins(type: Jar) { def io = it @@ -48,6 +52,14 @@ task mergePlugins(type: Jar) { rename { "eptalist-LICENSE.txt" } } + rename { name -> + if (name.endsWith("-LICENSE.txt")) { + "META-INF/license/$name" + } else { + name + } + } + duplicatesStrategy = DuplicatesStrategy.INCLUDE } diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..ef59847 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +version = 1.5 \ No newline at end of file diff --git a/spigot/build.gradle b/spigot/build.gradle index db94e55..fec3544 100644 --- a/spigot/build.gradle +++ b/spigot/build.gradle @@ -2,8 +2,9 @@ plugins { id 'java' } -group = 'org.eg4rerer' -version = "1.4" +evaluationDependsOn(':base') +group = 'org.eptalist' +version = project.findProperty("version") repositories { mavenCentral() diff --git a/spigot/src/main/resources/plugin.yml b/spigot/src/main/resources/plugin.yml index 5ddfec7..0bfaa65 100644 --- a/spigot/src/main/resources/plugin.yml +++ b/spigot/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: EptaList -version: "1.4" +version: "${version}" main: org.eptalist.spigot.EptaList softdepend: - ModuleLoader \ No newline at end of file diff --git a/velocity/build.gradle b/velocity/build.gradle index ade5155..ba74768 100644 --- a/velocity/build.gradle +++ b/velocity/build.gradle @@ -4,8 +4,9 @@ plugins { id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.8' } -group = 'org.eg4rerer' -version = "1.4" +evaluationDependsOn(':base') +group = 'org.eptalist' +version = project.findProperty("version") repositories { mavenCentral()