[FIX] Скрипты gradle, окончательно.

This commit is contained in:
Zaxar163 2020-02-21 16:46:19 +01:00
parent 19ac80d449
commit 3da2951cac
No known key found for this signature in database
GPG key ID: 1FE4F2E1F053831B
8 changed files with 26 additions and 26 deletions

View file

@ -24,10 +24,11 @@
launch4j launch4j
launch4jCJ launch4jCJ
bundleOnly.extendsFrom bundle bundleOnly.extendsFrom bundle
compile.extendsFrom bundle, hikari, pack, launch4jCJ, launch4j compile.extendsFrom bundle, hikari, pack, launch4j
} }
jar { jar {
duplicatesStrategy = 'INCLUDE'
dependsOn parent.childProjects.Launcher.tasks.build dependsOn parent.childProjects.Launcher.tasks.build
from { configurations.pack.collect { it.isDirectory() ? it : zipTree(it) } } from { configurations.pack.collect { it.isDirectory() ? it : zipTree(it) } }
from(parent.childProjects.Launcher.tasks.shadowJar.archivePath) from(parent.childProjects.Launcher.tasks.shadowJar.archivePath)
@ -113,7 +114,7 @@ pack project(':LauncherAPI')
compileOnlyA 'com.google.guava:guava:26.0-jre' compileOnlyA 'com.google.guava:guava:26.0-jre'
compileOnlyA 'log4j:log4j:1.2.17' // Do not update (laggy dep). compileOnlyA 'log4j:log4j:1.2.17' // Do not update (laggy dep).
compileOnlyA 'org.apache.logging.log4j:log4j-core:2.11.2' 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) { task hikari(type: Copy) {

View file

@ -1,6 +1,4 @@
plugins { apply plugin: 'org.openjfx.javafxplugin'
id 'org.openjfx.javafxplugin' version '0.0.5'
}
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.github.johnrengelman.shadow'
String mainClassName = "pro.gravit.launcher.ClientLauncherWrapper" String mainClassName = "pro.gravit.launcher.ClientLauncherWrapper"
@ -21,7 +19,7 @@
configurations { configurations {
bundle bundle
pack pack
compile.extendsFrom bundle, pack api.extendsFrom bundle, pack
} }
jar { jar {

View file

@ -2,9 +2,9 @@
targetCompatibility = '1.8' targetCompatibility = '1.8'
dependencies { dependencies {
compile project(':LauncherCore') api project(':LauncherCore')
compileOnly 'io.netty:netty-codec-http:4.1.43.Final' implementation 'io.netty:netty-codec-http:4.1.43.Final'
testCompile 'org.junit.jupiter:junit-jupiter:5.4.1' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.1'
} }
test { test {

View file

@ -2,7 +2,7 @@
targetCompatibility = '1.8' targetCompatibility = '1.8'
dependencies { dependencies {
compile project(':LauncherAPI') api project(':LauncherAPI')
compileOnly 'com.google.guava:guava:26.0-jre' implementation 'com.google.guava:guava:26.0-jre'
compile files('../compat/authlib/authlib-clean.jar') api files('../compat/authlib/authlib-clean.jar')
} }

View file

@ -1,15 +1,15 @@
apply plugin: 'java-library' apply plugin: 'java'
sourceCompatibility = '1.8' sourceCompatibility = '1.8'
targetCompatibility = '1.8' targetCompatibility = '1.8'
dependencies { dependencies {
compileOnly 'org.fusesource.jansi:jansi:1.18' api 'org.fusesource.jansi:jansi:1.18'
compileOnly 'org.jline:jline:3.11.0' api 'org.jline:jline:3.11.0'
compileOnly 'org.jline:jline-reader:3.11.0' api 'org.jline:jline-reader:3.11.0'
compileOnly 'org.jline:jline-terminal:3.11.0' api 'org.jline:jline-terminal:3.11.0'
compileOnly 'org.bouncycastle:bcprov-jdk15:1.46' api 'org.bouncycastle:bcprov-jdk15:1.46'
compile 'com.google.code.gson:gson:2.8.5' api 'com.google.code.gson:gson:2.8.5'
testCompile 'org.junit.jupiter:junit-jupiter:5.4.1' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.1'
} }
test { test {

View file

@ -5,7 +5,7 @@
configurations { configurations {
pack pack
compile.extendsFrom pack api.extendsFrom pack
} }
repositories { repositories {

View file

@ -1,7 +1,8 @@
plugins { 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 'maven-publish'
id 'signing' id 'signing'
id 'org.openjfx.javafxplugin' version '0.0.8' apply false
} }
group = 'pro.gravit.launcher' group = 'pro.gravit.launcher'
version = '5.1.1-SNAPSHOT' version = '5.1.1-SNAPSHOT'
@ -9,7 +10,7 @@
configure(subprojects.findAll { it.name != 'modules' }) { configure(subprojects.findAll { it.name != 'modules' }) {
apply plugin: 'idea' apply plugin: 'idea'
apply plugin: 'eclipse' apply plugin: 'eclipse'
apply plugin: 'java' apply plugin: 'java-library'
group = 'pro.gravit' group = 'pro.gravit'
@ -26,8 +27,8 @@
aptCompileOnly aptCompileOnly
aptOnly aptOnly
aptOnly.extendsFrom apt, aptCompileOnly aptOnly.extendsFrom apt, aptCompileOnly
compile.extendsFrom apt api.extendsFrom apt
compileOnly.extendsFrom aptCompileOnly implementation.extendsFrom aptCompileOnly
} }
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {

@ -1 +1 @@
Subproject commit fa9403131f0d3caed104d323128b241ac05ecda3 Subproject commit d430430a83080312a420ee6b91d335b23d75c693