From 50a9d96f71cbe3c6dee1449063f98fa5607b605f Mon Sep 17 00:00:00 2001 From: Zaxar163 Date: Tue, 13 Aug 2019 14:49:41 +0300 Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=9F=D0=BE=D1=87=D0=B8=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BF=D1=83=D0=B1=D0=BB=D0=B8=D0=BA=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D1=8E=20=D0=B2=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D0=B0?= =?UTF-8?q?=D1=85=20gradle.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LaunchServer/build.gradle | 8 +++---- Launcher/build.gradle | 50 +++++++++++++++++++-------------------- LauncherAPI/build.gradle | 46 +++++++++++++++++------------------ LauncherCore/build.gradle | 46 +++++++++++++++++------------------ build.gradle | 21 ++++++++-------- 5 files changed, 86 insertions(+), 85 deletions(-) diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle index e370e04d..0a64bd8a 100644 --- a/LaunchServer/build.gradle +++ b/LaunchServer/build.gradle @@ -57,6 +57,7 @@ task cleanjar(type: Jar, dependsOn: jar) { pack project(':LauncherAPI') bundle 'org.ow2.asm:asm-commons:7.1' bundle 'mysql:mysql-connector-java:8.0.16' + bundle 'org.postgresql:postgresql:42.2.6' bundle 'org.jline:jline:3.11.0' bundle 'org.jline:jline-reader:3.11.0' bundle 'org.jline:jline-terminal:3.11.0' @@ -66,7 +67,7 @@ pack project(':LauncherAPI') bundle 'commons-codec:commons-codec:1.12' bundle 'org.javassist:javassist:3.25.0-GA' bundle 'io.netty:netty-all:4.1.36.Final' - bundle 'org.hibernate:hibernate-core:5.4.3.Final' + bundle 'org.hibernate:hibernate-core:5.4.4.Final' bundle 'org.bouncycastle:bcpkix-jdk15on:1.61' bundle 'org.slf4j:slf4j-simple:1.7.25' @@ -162,7 +163,6 @@ task dumpClientLibs(type: Copy) { build.dependsOn tasks.dumpLibs, tasks.dumpCompileOnlyLibs, tasks.dumpClientLibs, tasks.bundle, tasks.cleanjar - publishing { publications { @@ -209,6 +209,6 @@ task dumpClientLibs(type: Copy) { } -signing { +signing { sign publishing.publications.launchserverapi -} +} diff --git a/Launcher/build.gradle b/Launcher/build.gradle index 96b87ed3..a1d73860 100644 --- a/Launcher/build.gradle +++ b/Launcher/build.gradle @@ -59,32 +59,32 @@ task dumpLibs(type: Copy) { build.dependsOn tasks.genRuntimeJS, tasks.dumpLibs, tasks.shadowJar -publishing { - publications { - launcherclientapi(MavenPublication) { +publishing { + publications { + launcherclientapi(MavenPublication) { artifactId = 'launcher-client-api' artifact jar - pom { - name = 'GravitLauncher Client API' - description = 'GravitLauncher Client Module API' - url = 'https://launcher.gravit.pro' - licenses { - license { - name = 'GNU General Public License, Version 3.0' - url = 'https://www.gnu.org/licenses/gpl-3.0.html' - } - } - scm { - connection = 'scm:git:https://github.com/GravitLauncher/Launcher.git' - developerConnection = 'scm:git:ssh://git@github.com:GravitLauncher/Launcher.git' - url = 'https://launcher.gravit.pro/' - } - } - } - } + pom { + name = 'GravitLauncher Client API' + description = 'GravitLauncher Client Module API' + url = 'https://launcher.gravit.pro' + licenses { + license { + name = 'GNU General Public License, Version 3.0' + url = 'https://www.gnu.org/licenses/gpl-3.0.html' + } + } + scm { + connection = 'scm:git:https://github.com/GravitLauncher/Launcher.git' + developerConnection = 'scm:git:ssh://git@github.com:GravitLauncher/Launcher.git' + url = 'https://launcher.gravit.pro/' + } + } + } + } } - - -signing { + + +signing { sign publishing.publications.launcherclientapi -} +} diff --git a/LauncherAPI/build.gradle b/LauncherAPI/build.gradle index 41050bc6..e246c6e8 100644 --- a/LauncherAPI/build.gradle +++ b/LauncherAPI/build.gradle @@ -11,31 +11,31 @@ compile project(':LauncherCore') classifier = 'clean' } -publishing { - publications { - launcherwsapi(MavenPublication) { +publishing { + publications { + launcherwsapi(MavenPublication) { artifactId = 'launcher-ws-api' artifact jar - pom { - name = 'GravitLauncher WebSocket API' - description = 'GravitLauncher WebSocket Module API' - url = 'https://launcher.gravit.pro' - licenses { - license { - name = 'GNU General Public License, Version 3.0' - url = 'https://www.gnu.org/licenses/gpl-3.0.html' - } - } - scm { - connection = 'scm:git:https://github.com/GravitLauncher/Launcher.git' - developerConnection = 'scm:git:ssh://git@github.com:GravitLauncher/Launcher.git' - url = 'https://launcher.gravit.pro/' - } - } - } - } + pom { + name = 'GravitLauncher WebSocket API' + description = 'GravitLauncher WebSocket Module API' + url = 'https://launcher.gravit.pro' + licenses { + license { + name = 'GNU General Public License, Version 3.0' + url = 'https://www.gnu.org/licenses/gpl-3.0.html' + } + } + scm { + connection = 'scm:git:https://github.com/GravitLauncher/Launcher.git' + developerConnection = 'scm:git:ssh://git@github.com:GravitLauncher/Launcher.git' + url = 'https://launcher.gravit.pro/' + } + } + } + } } -signing { +signing { sign publishing.publications.launcherwsapi -} +} diff --git a/LauncherCore/build.gradle b/LauncherCore/build.gradle index eedc675a..26e815e4 100644 --- a/LauncherCore/build.gradle +++ b/LauncherCore/build.gradle @@ -13,31 +13,31 @@ classifier = 'clean' } -publishing { - publications { - launchercore(MavenPublication) { +publishing { + publications { + launchercore(MavenPublication) { artifactId = 'launcher-core' artifact jar - pom { - name = 'GravitLauncher Core Utils' - description = 'GravitLauncher Core Utils' - url = 'https://launcher.gravit.pro' - licenses { - license { - name = 'GNU General Public License, Version 3.0' - url = 'https://www.gnu.org/licenses/gpl-3.0.html' - } - } - scm { - connection = 'scm:git:https://github.com/GravitLauncher/Launcher.git' - developerConnection = 'scm:git:ssh://git@github.com:GravitLauncher/Launcher.git' - url = 'https://launcher.gravit.pro/' - } - } - } - } + pom { + name = 'GravitLauncher Core Utils' + description = 'GravitLauncher Core Utils' + url = 'https://launcher.gravit.pro' + licenses { + license { + name = 'GNU General Public License, Version 3.0' + url = 'https://www.gnu.org/licenses/gpl-3.0.html' + } + } + scm { + connection = 'scm:git:https://github.com/GravitLauncher/Launcher.git' + developerConnection = 'scm:git:ssh://git@github.com:GravitLauncher/Launcher.git' + url = 'https://launcher.gravit.pro/' + } + } + } + } } -signing { +signing { sign publishing.publications.launchercore -} +} diff --git a/build.gradle b/build.gradle index 4f48a011..10603e99 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ id 'maven-publish' id 'signing' } -group = 'pro.gravit.launcher' +group = 'pro.gravit.launcher' version = '5.0.5-SNAPSHOT' configure(subprojects.findAll { it.name != 'modules' }) { @@ -48,15 +48,16 @@ defaultTasks 'build' -publishing { - repositories { - maven { - // change URLs to point to your repos, e.g. http://my.org/repo - url = version.endsWith('SNAPSHOT') ? mavenSnapshotRepository : mavenReleaseRepository - credentials { - username mavenUsername - password mavenPassword +if (hasProperty('mavenUsername') && hasProperty('mavenPassword')) +publishing { + repositories { + maven { + // change URLs to point to your repos, e.g. http://my.org/repo + url = version.endsWith('SNAPSHOT') ? 'https://oss.sonatype.org/content/repositories/snapshots/' : 'https://oss.sonatype.org/service/local/staging/deploy/maven2/' + credentials { + username getProperty('mavenUsername') + password getProperty('mavenPassword') } - } + } } }