From 3da2951cace5459d3e1eaf78c411ac1eb3528a62 Mon Sep 17 00:00:00 2001 From: Zaxar163 Date: Fri, 21 Feb 2020 16:46:19 +0100 Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=A1=D0=BA=D1=80=D0=B8=D0=BF=D1=82?= =?UTF-8?q?=D1=8B=20gradle,=20=D0=BE=D0=BA=D0=BE=D0=BD=D1=87=D0=B0=D1=82?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LaunchServer/build.gradle | 5 +++-- Launcher/build.gradle | 6 ++---- LauncherAPI/build.gradle | 6 +++--- LauncherAuthlib/build.gradle | 6 +++--- LauncherCore/build.gradle | 16 ++++++++-------- ServerWrapper/build.gradle | 2 +- build.gradle | 9 +++++---- modules | 2 +- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle index 190a175c..3afe323d 100644 --- a/LaunchServer/build.gradle +++ b/LaunchServer/build.gradle @@ -24,10 +24,11 @@ launch4j launch4jCJ bundleOnly.extendsFrom bundle - compile.extendsFrom bundle, hikari, pack, launch4jCJ, launch4j + compile.extendsFrom bundle, hikari, pack, launch4j } jar { + duplicatesStrategy = 'INCLUDE' dependsOn parent.childProjects.Launcher.tasks.build from { configurations.pack.collect { it.isDirectory() ? it : zipTree(it) } } from(parent.childProjects.Launcher.tasks.shadowJar.archivePath) @@ -113,7 +114,7 @@ pack project(':LauncherAPI') compileOnlyA 'com.google.guava:guava:26.0-jre' compileOnlyA 'log4j:log4j:1.2.17' // Do not update (laggy dep). compileOnlyA 'org.apache.logging.log4j:log4j-core:2.11.2' - testCompile 'org.junit.jupiter:junit-jupiter:5.4.1' + testImplementation 'org.junit.jupiter:junit-jupiter:5.4.1' } task hikari(type: Copy) { diff --git a/Launcher/build.gradle b/Launcher/build.gradle index 0ddb6d06..7c01ec74 100644 --- a/Launcher/build.gradle +++ b/Launcher/build.gradle @@ -1,6 +1,4 @@ -plugins { - id 'org.openjfx.javafxplugin' version '0.0.5' -} +apply plugin: 'org.openjfx.javafxplugin' apply plugin: 'com.github.johnrengelman.shadow' String mainClassName = "pro.gravit.launcher.ClientLauncherWrapper" @@ -21,7 +19,7 @@ configurations { bundle pack - compile.extendsFrom bundle, pack + api.extendsFrom bundle, pack } jar { diff --git a/LauncherAPI/build.gradle b/LauncherAPI/build.gradle index c6382a08..aff52823 100644 --- a/LauncherAPI/build.gradle +++ b/LauncherAPI/build.gradle @@ -2,9 +2,9 @@ targetCompatibility = '1.8' dependencies { - compile project(':LauncherCore') - compileOnly 'io.netty:netty-codec-http:4.1.43.Final' - testCompile 'org.junit.jupiter:junit-jupiter:5.4.1' + api project(':LauncherCore') + implementation 'io.netty:netty-codec-http:4.1.43.Final' + testImplementation 'org.junit.jupiter:junit-jupiter:5.4.1' } test { diff --git a/LauncherAuthlib/build.gradle b/LauncherAuthlib/build.gradle index c80e6841..ce574258 100644 --- a/LauncherAuthlib/build.gradle +++ b/LauncherAuthlib/build.gradle @@ -2,7 +2,7 @@ targetCompatibility = '1.8' dependencies { - compile project(':LauncherAPI') - compileOnly 'com.google.guava:guava:26.0-jre' - compile files('../compat/authlib/authlib-clean.jar') + api project(':LauncherAPI') + implementation 'com.google.guava:guava:26.0-jre' + api files('../compat/authlib/authlib-clean.jar') } diff --git a/LauncherCore/build.gradle b/LauncherCore/build.gradle index c4783f31..94101c17 100644 --- a/LauncherCore/build.gradle +++ b/LauncherCore/build.gradle @@ -1,15 +1,15 @@ -apply plugin: 'java-library' +apply plugin: 'java' sourceCompatibility = '1.8' targetCompatibility = '1.8' dependencies { - compileOnly 'org.fusesource.jansi:jansi:1.18' - compileOnly 'org.jline:jline:3.11.0' - compileOnly 'org.jline:jline-reader:3.11.0' - compileOnly 'org.jline:jline-terminal:3.11.0' - compileOnly 'org.bouncycastle:bcprov-jdk15:1.46' - compile 'com.google.code.gson:gson:2.8.5' - testCompile 'org.junit.jupiter:junit-jupiter:5.4.1' + api 'org.fusesource.jansi:jansi:1.18' + api 'org.jline:jline:3.11.0' + api 'org.jline:jline-reader:3.11.0' + api 'org.jline:jline-terminal:3.11.0' + api 'org.bouncycastle:bcprov-jdk15:1.46' + api 'com.google.code.gson:gson:2.8.5' + testImplementation 'org.junit.jupiter:junit-jupiter:5.4.1' } test { diff --git a/ServerWrapper/build.gradle b/ServerWrapper/build.gradle index 6c69d053..dd10b6f9 100644 --- a/ServerWrapper/build.gradle +++ b/ServerWrapper/build.gradle @@ -5,7 +5,7 @@ configurations { pack - compile.extendsFrom pack + api.extendsFrom pack } repositories { diff --git a/build.gradle b/build.gradle index 8c03a9e7..d67ce7a2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,8 @@ plugins { - id 'com.github.johnrengelman.shadow' version '5.0.0' apply false + id 'com.github.johnrengelman.shadow' version '5.2.0' apply false id 'maven-publish' id 'signing' + id 'org.openjfx.javafxplugin' version '0.0.8' apply false } group = 'pro.gravit.launcher' version = '5.1.1-SNAPSHOT' @@ -9,7 +10,7 @@ configure(subprojects.findAll { it.name != 'modules' }) { apply plugin: 'idea' apply plugin: 'eclipse' - apply plugin: 'java' + apply plugin: 'java-library' group = 'pro.gravit' @@ -26,8 +27,8 @@ aptCompileOnly aptOnly aptOnly.extendsFrom apt, aptCompileOnly - compile.extendsFrom apt - compileOnly.extendsFrom aptCompileOnly + api.extendsFrom apt + implementation.extendsFrom aptCompileOnly } tasks.withType(JavaCompile) { diff --git a/modules b/modules index fa940313..d430430a 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit fa9403131f0d3caed104d323128b241ac05ecda3 +Subproject commit d430430a83080312a420ee6b91d335b23d75c693