From 35adc585bde9b33e7874688073a53079767be781 Mon Sep 17 00:00:00 2001 From: r-lodahl Date: Mon, 4 May 2020 10:24:12 +0200 Subject: [PATCH 1/8] gradle 6.3 --- gradle/wrapper/gradle-wrapper.jar | Bin 54783 -> 54783 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 4dd9da4cdb1a80d0ec3bcebd8b31814eea8ca318..03b2f2e21bef9cf1e575d9ab398fdcc4a751b5f9 100644 GIT binary patch delta 26 gcmeyrn)&}~<_*?InC}EF*=%>DP!PnJyy>bh0JnM#QUCw| delta 26 gcmeyrn)&}~<_*?Im?y7XyxHzZp&*DcdDB&20Jr-MYybcN diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f9df4ad62..534a81c39 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun May 03 21:12:38 CEST 2020 +#Mon May 04 10:22:56 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip From 792c376b7aeeb4ef3e8d15878a91f53f95c94746 Mon Sep 17 00:00:00 2001 From: r-lodahl Date: Mon, 4 May 2020 13:19:06 +0200 Subject: [PATCH 2/8] Java14. Updated deps, removed proguard --- build.gradle | 77 ++--- gradle/wrapper/gradle-wrapper.jar | Bin 54783 -> 58694 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 57 ++-- gradlew.bat | 21 +- illabuild/build.gradle | 27 +- .../illarion/build/ConvertPlugin.groovy | 5 +- illaclient/build.gradle | 51 ++-- .../util/translation/TranslateTaskTest.java | 277 ------------------ illacommon/build.gradle | 36 +-- illacompiler/build.gradle | 86 ++---- illacompiler/compiler.pro | 72 ----- illadownload/build.gradle | 107 +++---- .../gui/controller/ApplicationController.java | 26 +- .../download/gui/view/ApplicationView.java | 19 +- illaeasynpc/build.gradle | 54 ++-- illaeasyquest/build.gradle | 43 +-- illagameengine-libgdx/build.gradle | 32 +- illagameengine-nifty/build.gradle | 29 +- illagameengine/build.gradle | 26 +- illamapedit/build.gradle | 59 ++-- javafx.plugin | 97 ------ nifty-controls-illarion/build.gradle | 29 +- .../message/builder/DialogMessageBuilder.java | 4 +- nifty-style-illarion/build.gradle | 21 +- pmd.xml | 56 ++-- settings.gradle | 52 ++-- versions.gradle | 8 +- 28 files changed, 435 insertions(+), 939 deletions(-) delete mode 100644 illaclient/src/test/java/illarion/client/util/translation/TranslateTaskTest.java delete mode 100644 illacompiler/compiler.pro delete mode 100644 javafx.plugin diff --git a/build.gradle b/build.gradle index a6ad50ead..b6d74c8f7 100644 --- a/build.gradle +++ b/build.gradle @@ -14,15 +14,33 @@ * GNU General Public License for more details. */ -apply plugin: 'idea' +buildscript { + repositories { + mavenCentral() + maven { + url 'https://maven.ej-technologies.com/repository' + } + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + classpath group: 'de.undercouch', name: 'gradle-download-task', version: '4.0.4' + classpath group: 'com.install4j', name: 'install4j-gradle', version: '7.0.12' + } +} + +plugins { + id "idea" +} -task wrapper(type: Wrapper) { - gradleVersion = '3.5' +wrapper { + gradleVersion = '6.3' } idea { project { - languageLevel = '1.8' + languageLevel = '1.14' } } @@ -36,7 +54,7 @@ allprojects { task gitVersion { task -> def gitVersion = 'unknown' def branch = 'develop' - def File rootDir = project.rootDir + File rootDir = project.rootDir for (def gitCmd in ['git', 'git.cmd']) { try { def procBranch = "$gitCmd rev-parse --abbrev-ref HEAD".execute(null as List, rootDir) @@ -55,7 +73,7 @@ allprojects { } } - def String mainVersion + String mainVersion def indexOfSeparator = gitVersion.indexOf('-') if (indexOfSeparator == -1) { mainVersion = gitVersion @@ -86,35 +104,25 @@ allprojects { repositories { mavenCentral() maven { - url 'http://illarion.org/media/java/maven' + url 'https://illarion.org/media/java/maven' } maven { - url 'http://oss.sonatype.org/content/repositories/releases' + url 'https://oss.sonatype.org/content/repositories/releases' } - } -} - -buildscript { - repositories { - mavenCentral() maven { - url 'http://maven.ej-technologies.com/repository' + url 'https://dl.bintray.com/flowtick/jgraphx' } } - dependencies { - classpath group: 'net.sf.proguard', name: 'proguard-gradle', version: '5.2.1' - classpath group: 'de.undercouch', name: 'gradle-download-task', version: '2.1.0' - classpath group: 'com.install4j', name: 'install4j-gradle', version: '6.0.4' - } } subprojects { group = 'org.illarion' - plugins.withType(JavaPlugin) { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + apply plugin: 'java' + sourceCompatibility = JavaVersion.VERSION_14 + targetCompatibility = JavaVersion.VERSION_14 + plugins.withType(JavaPlugin) { tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } @@ -136,30 +144,23 @@ subprojects { test.runtimeClasspath += configurations.provided } dependencies { - testCompile group: 'org.testng', name: 'testng', version: '6.9.10' - testCompile group: 'org.easymock', name: 'easymock', version: '3.4' - testCompile group: 'org.powermock', name: 'powermock-module-testng', version: '1.6.4' - testCompile group: 'org.powermock', name: 'powermock-api-easymock', version: '1.6.4' - testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3' - compile group: 'org.jetbrains', name: 'annotations', version: '15.0' - compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1' + testImplementation group: 'org.testng', name: 'testng', version: '7.1.0' + testImplementation group: 'org.easymock', name: 'easymock', version: '4.2' + testImplementation group: 'org.powermock', name: 'powermock-module-testng', version: '2.0.7' + testImplementation group: 'org.powermock', name: 'powermock-api-easymock', version: '2.0.7' + testImplementation group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3' + implementation group: 'org.jetbrains', name: 'annotations', version: '19.0.0' } } apply plugin: 'idea' - apply plugin: 'findbugs' apply plugin: 'pmd' - findbugs { - ignoreFailures = true - effort = "max" - reportLevel = "high" - } + pmd { ignoreFailures = true ruleSetFiles = files(new File(rootDir, 'pmd.xml')) ruleSets = [] - toolVersion = '5.4.1' - targetJdk = '1.7' + toolVersion = '6.21.0' } idea { module { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 03b2f2e21bef9cf1e575d9ab398fdcc4a751b5f9..490fda8577df6c95960ba7077c43220e5bb2c0d9 100644 GIT binary patch literal 58694 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 literal 54783 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 { private final Instantiator instantiator @Inject - public ConvertPlugin(Instantiator instantiator) { + ConvertPlugin(Instantiator instantiator) { this.instantiator = instantiator } @@ -101,7 +100,7 @@ class ConvertPlugin implements Plugin { compileConfiguration.artifacts.add(jarArtifact) project.extensions.getByType(DefaultArtifactPublicationSet).addCandidate(jarArtifact) - project.components.add(new JavaLibrary(jarArtifact, compileConfiguration.allDependencies)); + project.artifacts.add(COMPILE_CONFIGURATION_NAME, jar); } static void configureConfigurations(Project project) { diff --git a/illaclient/build.gradle b/illaclient/build.gradle index 03a78dcea..f30959ed2 100644 --- a/illaclient/build.gradle +++ b/illaclient/build.gradle @@ -23,30 +23,33 @@ archivesBaseName = 'illarion_client' mainClassName = 'illarion.client.IllaClient' dependencies { - compile project(':common') - compile project(':engine') - runtime project(':engine-libgdx') - compile project(':engine-nifty') - compile project(':nifty-controls') - runtime project(':nifty-style') - compile group: 'org.slf4j', name: 'slf4j-api', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'jul-to-slf4j', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'jcl-over-slf4j', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'log4j-over-slf4j', version: project.ext.slf4jVersion - compile group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion - compile group: 'org.bushe', name: 'eventbus', version: '1.4' - compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0' - compile group: 'com.google.guava', name: 'guava', version: '21.0' - compile group: 'com.github.nifty-gui', name: 'nifty', version: project.ext.niftyGuiVersion - runtime group: 'org.illarion', name: 'rsc_books', version: project.ext.illarionResourcesVersion - runtime group: 'org.illarion', name: 'rsc_chars', version: project.ext.illarionResourcesVersion - runtime group: 'org.illarion', name: 'rsc_effects', version: project.ext.illarionResourcesVersion - runtime group: 'org.illarion', name: 'rsc_gui', version: project.ext.illarionResourcesVersion - runtime group: 'org.illarion', name: 'rsc_items', version: project.ext.illarionResourcesVersion - runtime group: 'org.illarion', name: 'rsc_music', version: project.ext.illarionResourcesVersion - runtime group: 'org.illarion', name: 'rsc_sounds', version: project.ext.illarionResourcesVersion - runtime group: 'org.illarion', name: 'rsc_tables', version: project.ext.illarionResourcesVersion - runtime group: 'org.illarion', name: 'rsc_tiles', version: project.ext.illarionResourcesVersion + implementation project(':common') + implementation project(':engine') + runtimeOnly project(':engine-libgdx') + implementation project(':engine-nifty') + implementation project(':nifty-controls') + runtimeOnly project(':nifty-style') + implementation group: 'com.github.nifty-gui', name: 'nifty', version: project.ext.niftyGuiVersion + implementation group: 'com.github.nifty-gui', name: 'nifty-default-controls', version: project.ext.niftyGuiVersion + implementation group: 'org.slf4j', name: 'slf4j-api', version: project.ext.slf4jVersion + implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: project.ext.slf4jVersion + implementation group: 'org.slf4j', name: 'jcl-over-slf4j', version: project.ext.slf4jVersion + implementation group: 'org.slf4j', name: 'log4j-over-slf4j', version: project.ext.slf4jVersion + implementation group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion + implementation group: 'org.bushe', name: 'eventbus', version: '1.4' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.0' + implementation group: 'com.google.guava', name: 'guava', version: '21.0' + implementation 'com.google.code.findbugs:jsr305:3.0.2' + implementation group: 'com.github.nifty-gui', name: 'nifty', version: project.ext.niftyGuiVersion + runtimeOnly group: 'org.illarion', name: 'rsc_books', version: project.ext.illarionResourcesVersion + runtimeOnly group: 'org.illarion', name: 'rsc_chars', version: project.ext.illarionResourcesVersion + runtimeOnly group: 'org.illarion', name: 'rsc_effects', version: project.ext.illarionResourcesVersion + runtimeOnly group: 'org.illarion', name: 'rsc_gui', version: project.ext.illarionResourcesVersion + runtimeOnly group: 'org.illarion', name: 'rsc_items', version: project.ext.illarionResourcesVersion + runtimeOnly group: 'org.illarion', name: 'rsc_music', version: project.ext.illarionResourcesVersion + runtimeOnly group: 'org.illarion', name: 'rsc_sounds', version: project.ext.illarionResourcesVersion + runtimeOnly group: 'org.illarion', name: 'rsc_tables', version: project.ext.illarionResourcesVersion + runtimeOnly group: 'org.illarion', name: 'rsc_tiles', version: project.ext.illarionResourcesVersion } jar { diff --git a/illaclient/src/test/java/illarion/client/util/translation/TranslateTaskTest.java b/illaclient/src/test/java/illarion/client/util/translation/TranslateTaskTest.java deleted file mode 100644 index 8a3454136..000000000 --- a/illaclient/src/test/java/illarion/client/util/translation/TranslateTaskTest.java +++ /dev/null @@ -1,277 +0,0 @@ -/* - * This file is part of the Illarion project. - * - * Copyright © 2015 - Illarion e.V. - * - * Illarion is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Illarion is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ -package illarion.client.util.translation;/* - * This file is part of the Illarion project. - * - * Copyright © 2015 - Illarion e.V. - * - * Illarion is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Illarion is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -import org.easymock.EasyMockSupport; -import org.easymock.Mock; -import org.powermock.api.easymock.PowerMock; -import org.powermock.core.classloader.annotations.PowerMockIgnore; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.testng.PowerMockObjectFactory; -import org.testng.IObjectFactory; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.ObjectFactory; -import org.testng.annotations.Test; - -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; - -import static org.easymock.EasyMock.expect; - -/** - * @author Martin Karing <nitram@illarion.org> - */ -@PrepareForTest({TranslateSentenceTask.class, TranslateTask.class}) -@PowerMockIgnore({"javax.management.*", "javax.xml.parsers.*", "com.sun.org.apache.xerces.internal.jaxp.*", - "ch.qos.logback.*", "org.slf4j.*"}) -public class TranslateTaskTest extends EasyMockSupport { - @Mock - private ExecutorService service; - @Mock - private TranslationProvider provider; - @Mock - private TranslatorCallback callback; - - /** - * Test if the translation task correctly splits a complex chat line into sentences. - * - * @throws Exception - */ - @SuppressWarnings({"ConstantConditions", "unchecked", "OverlyLongMethod"}) - @Test - public void testSentenceSplit() throws Exception { - service = createMock(ExecutorService.class); - provider = createMock(TranslationProvider.class); - callback = createMock(TranslatorCallback.class); - replayAll(); - - Callable task = new TranslateTask(service, provider, TranslationDirection.EnglishToGerman, - "Hello. This is a multi sentence line! It should be split. Even if the last part is not terminated", - callback); - verifyAll(); - resetAll(); - - // until now nothing should happen to ensure that the creation of the task is very cheap - // the next thing is calling the task and that should actually do things. - Future firstFuture = createMock(Future.class); - expect(firstFuture.get()).andReturn("Hallo.").anyTimes(); - TranslateSentenceTask task1Mock = PowerMock.createMock(TranslateSentenceTask.class); - PowerMock.expectStrictNew(TranslateSentenceTask.class, - new Class[]{TranslationProvider.class, TranslationDirection.class, String.class}, - provider, TranslationDirection.EnglishToGerman, "Hello.") - .andReturn(task1Mock); - expect(service.submit(task1Mock)).andReturn(firstFuture); - - Future secondFuture = createMock(Future.class); - expect(secondFuture.get()).andReturn("Das ist eine Zeile mit mehreren Sätzen.").anyTimes(); - TranslateSentenceTask task2Mock = PowerMock.createMock(TranslateSentenceTask.class); - PowerMock.expectStrictNew(TranslateSentenceTask.class, - new Class[]{TranslationProvider.class, TranslationDirection.class, String.class}, - provider, TranslationDirection.EnglishToGerman, - "This is a multi sentence line!").andReturn(task2Mock); - expect(service.submit(task2Mock)).andReturn(secondFuture); - - Future thirdFuture = createMock(Future.class); - expect(thirdFuture.get()).andReturn("Sie sollte geteilt werden.").anyTimes(); - TranslateSentenceTask task3Mock = PowerMock.createMock(TranslateSentenceTask.class); - PowerMock.expectStrictNew(TranslateSentenceTask.class, - new Class[]{TranslationProvider.class, TranslationDirection.class, String.class}, - provider, TranslationDirection.EnglishToGerman, - "It should be split.").andReturn(task3Mock); - expect(service.submit(task3Mock)).andReturn(thirdFuture); - - Future fourthFuture = createMock(Future.class); - expect(fourthFuture.get()).andReturn("Auch wenn der letzte Teil nicht abgeschlossen ist").anyTimes(); - TranslateSentenceTask task4Mock = PowerMock.createMock(TranslateSentenceTask.class); - PowerMock.expectStrictNew(TranslateSentenceTask.class, - new Class[]{TranslationProvider.class, TranslationDirection.class, String.class}, - provider, TranslationDirection.EnglishToGerman, - "Even if the last part is not terminated").andReturn(task4Mock); - expect(service.submit(task4Mock)).andReturn(fourthFuture); - - callback.sendTranslation("Hallo. Das ist eine Zeile mit mehreren Sätzen. Sie sollte geteilt werden. Auch wenn" + - " der letzte Teil nicht abgeschlossen ist"); - - PowerMock.replay(task1Mock, task2Mock, task3Mock, task4Mock); - PowerMock.replay(TranslateSentenceTask.class); - replayAll(); - // Everything we expect is recorded. Let's do this. - - task.call(); - - PowerMock.verify(task1Mock, task2Mock, task3Mock, task4Mock); - PowerMock.verify(TranslateSentenceTask.class); - verifyAll(); - } - - /** - * Test if the translation task correctly excludes the default headers from the text. - * - * @throws Exception - */ - @SuppressWarnings({"ConstantConditions", "unchecked"}) - @Test - public void testHeaderExclusion1() throws Exception { - service = createMock(ExecutorService.class); - provider = createMock(TranslationProvider.class); - callback = createMock(TranslatorCallback.class); - replayAll(); - - Callable task = new TranslateTask(service, provider, TranslationDirection.EnglishToGerman, - "You hear: ALL YOUR BASE ARE BELONG TO US.", - callback); - verifyAll(); - resetAll(); - - // until now nothing should happen to ensure that the creation of the task is very cheap - // the next thing is calling the task and that should actually do things. - Future translationFuture = createMock(Future.class); - expect(translationFuture.get()).andReturn("ALL DEINE STÜTZPUNKT SIND GEHÖREN UNS.").anyTimes(); - TranslateSentenceTask sentenceTask = PowerMock.createMock(TranslateSentenceTask.class); - PowerMock.expectStrictNew(TranslateSentenceTask.class, - new Class[]{TranslationProvider.class, TranslationDirection.class, String.class}, - provider, TranslationDirection.EnglishToGerman, "ALL YOUR BASE ARE BELONG TO US.") - .andReturn(sentenceTask); - expect(service.submit(sentenceTask)).andReturn(translationFuture); - - callback.sendTranslation("You hear: ALL DEINE STÜTZPUNKT SIND GEHÖREN UNS."); - - PowerMock.replay(sentenceTask); - PowerMock.replay(TranslateSentenceTask.class); - replayAll(); - // Everything we expect is recorded. Let's do this. - - task.call(); - - PowerMock.verify(sentenceTask); - PowerMock.verify(TranslateSentenceTask.class); - verifyAll(); - } - - /** - * Test if the translation task correctly excludes headers that contain generic parts (names) from the text. - * - * @throws Exception - */ - @SuppressWarnings({"ConstantConditions", "unchecked"}) - @Test - public void testHeaderExclusion2() throws Exception { - service = createMock(ExecutorService.class); - provider = createMock(TranslationProvider.class); - callback = createMock(TranslatorCallback.class); - replayAll(); - - Callable task = new TranslateTask(service, provider, TranslationDirection.EnglishToGerman, - "Somebody says: ALL YOUR BASE ARE BELONG TO US.", - callback); - verifyAll(); - resetAll(); - - // until now nothing should happen to ensure that the creation of the task is very cheap - // the next thing is calling the task and that should actually do things. - Future translationFuture = createMock(Future.class); - expect(translationFuture.get()).andReturn("ALL DEINE STÜTZPUNKT SIND GEHÖREN UNS.").anyTimes(); - TranslateSentenceTask sentenceTask = PowerMock.createMock(TranslateSentenceTask.class); - PowerMock.expectStrictNew(TranslateSentenceTask.class, - new Class[]{TranslationProvider.class, TranslationDirection.class, String.class}, - provider, TranslationDirection.EnglishToGerman, "ALL YOUR BASE ARE BELONG TO US.") - .andReturn(sentenceTask); - expect(service.submit(sentenceTask)).andReturn(translationFuture); - - callback.sendTranslation("Somebody says: ALL DEINE STÜTZPUNKT SIND GEHÖREN UNS."); - - PowerMock.replay(sentenceTask); - PowerMock.replay(TranslateSentenceTask.class); - replayAll(); - // Everything we expect is recorded. Let's do this. - - task.call(); - - PowerMock.verify(sentenceTask); - PowerMock.verify(TranslateSentenceTask.class); - verifyAll(); - } - - /** - * Test if the translation task correctly identifies and excludes OOC marks from the translation. - * - * @throws Exception - */ - @SuppressWarnings({"ConstantConditions", "unchecked"}) - @Test - public void testHeaderExclusionOoc() throws Exception { - service = createMock(ExecutorService.class); - provider = createMock(TranslationProvider.class); - callback = createMock(TranslatorCallback.class); - replayAll(); - - Callable task = new TranslateTask(service, provider, TranslationDirection.EnglishToGerman, - "Somebody says: ((ALL YOUR BASE ARE BELONG TO US.))", - callback); - verifyAll(); - resetAll(); - - // until now nothing should happen to ensure that the creation of the task is very cheap - // the next thing is calling the task and that should actually do things. - Future translationFuture = createMock(Future.class); - expect(translationFuture.get()).andReturn("ALL DEINE STÜTZPUNKT SIND GEHÖREN UNS.").anyTimes(); - TranslateSentenceTask sentenceTask = PowerMock.createMock(TranslateSentenceTask.class); - PowerMock.expectStrictNew(TranslateSentenceTask.class, - new Class[]{TranslationProvider.class, TranslationDirection.class, String.class}, - provider, TranslationDirection.EnglishToGerman, "ALL YOUR BASE ARE BELONG TO US.") - .andReturn(sentenceTask); - expect(service.submit(sentenceTask)).andReturn(translationFuture); - - callback.sendTranslation("Somebody says: ((ALL DEINE STÜTZPUNKT SIND GEHÖREN UNS.))"); - - PowerMock.replay(sentenceTask); - PowerMock.replay(TranslateSentenceTask.class); - replayAll(); - // Everything we expect is recorded. Let's do this. - - task.call(); - - PowerMock.verify(sentenceTask); - PowerMock.verify(TranslateSentenceTask.class); - verifyAll(); - } - - @BeforeMethod - public void prepareTests() { - resetAll(); - PowerMock.reset(TranslateSentenceTask.class); - } - - @ObjectFactory - public IObjectFactory getObjectFactory() { - return new PowerMockObjectFactory(); - } -} diff --git a/illacommon/build.gradle b/illacommon/build.gradle index 29557a69b..adcbbd33e 100644 --- a/illacommon/build.gradle +++ b/illacommon/build.gradle @@ -16,19 +16,20 @@ import de.undercouch.gradle.tasks.download.Download apply plugin: 'java' +apply plugin: 'java-library' apply plugin: 'maven-publish' apply from: '../versions.gradle' archivesBaseName = 'illarion_common' dependencies { - compile group: 'org.jetbrains', name: 'annotations', version: '15.0' - compile group: 'org.slf4j', name: 'slf4j-api', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'log4j-over-slf4j', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'jcl-over-slf4j', version: project.ext.slf4jVersion - compile group: 'org.ogce', name: 'xpp3', version: '1.1.6' - compile group: 'org.bushe', name: 'eventbus', version: '1.4' - compile group: 'biz.futureware.mantis', name: 'mantis-axis-soap-client', version: '1.2.19' + api group: 'org.slf4j', name: 'slf4j-api', version: project.ext.slf4jVersion + api group: 'org.slf4j', name: 'log4j-over-slf4j', version: project.ext.slf4jVersion + api group: 'org.slf4j', name: 'jcl-over-slf4j', version: project.ext.slf4jVersion + implementation group: 'org.ogce', name: 'xpp3', version: '1.1.6' + implementation group: 'org.bushe', name: 'eventbus', version: '1.4' + implementation group: 'biz.futureware.mantis', name: 'mantis-axis-soap-client', version: '1.2.19' + api 'com.google.code.findbugs:jsr305:3.0.2' } processResources.dependsOn("downloadSkills") @@ -47,16 +48,17 @@ task downloadSkills(type: Download) { jar { dependsOn { gitVersion } manifest { - attributes \ - 'Permissions': 'all-permissions', \ - 'Codebase': 'illarion.org', \ - 'Trusted-Library': true, \ - 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), \ - 'Built-By': System.getProperty('user.name'), \ - 'Built-JDK': System.getProperty('java.version'), \ - 'Implementation-Title': 'Illarion Common Library', \ - 'Implementation-Vendor': 'Illarion e.V.', \ - 'Implementation-Version': project.ext.fullVersion + attributes( + 'Permissions': 'all-permissions', + 'Codebase': 'illarion.org', + 'Trusted-Library': true, + 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), + 'Built-By': System.getProperty('user.name'), + 'Built-JDK': System.getProperty('java.version'), + 'Implementation-Title': 'Illarion Common Library', + 'Implementation-Vendor': 'Illarion e.V.', + 'Implementation-Version': project.ext.fullVersion + ) } } diff --git a/illacompiler/build.gradle b/illacompiler/build.gradle index 22b4bf209..6d48a69bc 100644 --- a/illacompiler/build.gradle +++ b/illacompiler/build.gradle @@ -13,8 +13,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -import proguard.gradle.ProGuardTask - apply plugin: 'java' apply plugin: 'application' apply from: '../versions.gradle' @@ -23,78 +21,42 @@ archivesBaseName = 'illarion_compiler' mainClassName = 'illarion.compile.Compiler' dependencies { - compile project(':common') - compile project(':easynpc') - compile project(':easyquest') - compile group: 'commons-cli', name: 'commons-cli', version: '1.4' - compile group: 'org.slf4j', name: 'slf4j-api', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'jcl-over-slf4j', version: project.ext.slf4jVersion - compile group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion + implementation project(':easynpc') + implementation project(':easyquest') + implementation project(':common') + implementation group: 'commons-cli', name: 'commons-cli', version: '1.4' + implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: project.ext.slf4jVersion + implementation group: 'org.slf4j', name: 'slf4j-api', version: project.ext.slf4jVersion + implementation group: 'org.slf4j', name: 'jcl-over-slf4j', version: project.ext.slf4jVersion + implementation group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion + implementation group: 'com.mxgraph', name: 'jgraphx', version: '3.7.4' } jar { dependsOn { gitVersion } manifest { - attributes \ - 'Main-Class': 'illarion.compile.Compiler', \ - 'Permissions': 'all-permissions', \ - 'Codebase': 'illarion.org', \ - 'Application-Name': 'Illarion Compiler', \ - 'Application-Library-Allowable-Codebase': 'illarion.org', \ - 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), \ - 'Built-By': System.getProperty('user.name'), \ - 'Built-JDK': System.getProperty('java.version'), \ - 'Implementation-Title': 'Illarion Compiler', \ - 'Implementation-Vendor': 'Illarion e.V.', \ - 'Implementation-Version': project.ext.fullVersion - } -} - -task proguard(type: ProGuardTask, dependsOn: 'jar') { - final def mainFile = new File(project.buildDir, "libs/${project.archivesBaseName}-${project.version}.jar") - - injars(mainFile) - - configurations.runtime.each { File file -> - if (file.absolutePath.startsWith(System.getProperty('java.home'))) { - libraryjars file.absolutePath - } else if (!file.equals(mainFile)) { - def filter = "!META-INF/*,!META-INF/plexus/*,!META-INF/sisu/*,!META-INF/maven/**,!about.html,!LICENSE," + - "!OSGI-OPT/**,!**/packageinfo,!**.java,!xmlns/**" - if (file.absolutePath.contains("xpp3") || file.absolutePath.contains("axis-jaxrpc")) { - filter += ",!javax/xml/namespace/QName.class" - } - if (file.absolutePath.contains("illarion")) { - filter += ",!*.png,!logback.xml,!logback-to-file.xml" - filter += ",!Books.dat" - filter += ",!Chars.dat" - filter += ",!Cloth.dat" - filter += ",!Effects.dat" - filter += ",!Gui.dat" - filter += ",!Overlays.dat" - filter += ",!Runes.dat" - filter += ",!Sounds.dat" - filter += ",!Tiles.dat" - } - injars([filter: filter], file) - } + attributes( + 'Main-Class': 'illarion.compile.Compiler', + 'Permissions': 'all-permissions', + 'Codebase': 'illarion.org', + 'Application-Name': 'Illarion Compiler', + 'Application-Library-Allowable-Codebase': 'illarion.org', + 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), + 'Built-By': System.getProperty('user.name'), + 'Built-JDK': System.getProperty('java.version'), + 'Implementation-Title': 'Illarion Compiler', + 'Implementation-Vendor': 'Illarion e.V.', + 'Implementation-Version': project.ext.fullVersion + ) } - - configuration new File(project.projectDir, "compiler.pro") - - libraryjars files("${System.getProperty('java.home')}/lib/jce.jar") - libraryjars files("${System.getProperty('java.home')}/lib/rt.jar") - - outjars new File(project.buildDir, "compiler.jar") } - if (project.hasProperty('compilerDir')) { - task publishBundle(type: Copy, dependsOn: 'proguard') { + task publishBundle(type: Copy) { from new File(project.buildDir, "compiler.jar").absolutePath into file(project.compilerDir) } task publish(dependsOn: "publishBundle") {} } -build.dependsOn("proguard") +build diff --git a/illacompiler/compiler.pro b/illacompiler/compiler.pro deleted file mode 100644 index e98c15a1c..000000000 --- a/illacompiler/compiler.pro +++ /dev/null @@ -1,72 +0,0 @@ --target 1.8 - --dontoptimize --optimizationpasses 10 --allowaccessmodification --mergeinterfacesaggressively --optimizations !code/allocation/variable - --dontobfuscate - --renamesourcefileattribute SourceFile --keepattributes SourceFile, LineNumberTable --keepattributes *Annotation* - --allowaccessmodification - --keep public class illarion.compile.Compiler { - public static void main(java.lang.String[]); -} - --keepclassmembers class * { - @illarion.common.util.CalledByReflection *; -} - --keepclassmembers class * implements java.io.Serializable { - static final long serialVersionUID; - static final java.io.ObjectStreamField[] serialPersistentFields; - private void writeObject(java.io.ObjectOutputStream); - private void readObject(java.io.ObjectInputStream); - java.lang.Object writeReplace(); - java.lang.Object readResolve(); -} - --keep enum illarion.easynpc.data.* - --keepclassmembers enum illarion.easynpc.data.* { - public static **[] values(); -} - --keep class ch.qos.logback.core.ConsoleAppender { *; } --keep class ch.qos.logback.classic.LoggerContext { *; } --keep class ch.qos.logback.classic.encoder.PatternLayoutEncoder { *; } --keep class ch.qos.logback.classic.filter.LevelFilter { *; } - --keep public class ch.qos.logback.core.spi.FilterReply { - public static **[] values(); -} --keep public class ch.qos.logback.classic.Level { - public static *; -} --keep public class ch.qos.logback.classic.spi.** { *; } - --keep class org.xmlpull.mxp1.MXParserFactory - --keep class org.slf4j.impl.** - --dontwarn com.sun.** --dontwarn javax.servlet.** --dontwarn javax.mail.** --dontwarn javax.jms.** --dontwarn javax.xml.** --dontwarn org.pushingpixels.** --dontwarn org.apache.commons.** --dontwarn org.apache.axis.** --dontwarn org.mantisbt.** --dontwarn org.osgi.service.** --dontnote javax.xml.** --dontwarn ch.qos.logback.classic.** --dontwarn ch.qos.logback.core.joran.conditional.PropertyEvalScriptBuilder --dontwarn org.codehaus.janino.** --dontwarn org.apache.log4j.** --dontwarn org.slf4j.impl.** diff --git a/illadownload/build.gradle b/illadownload/build.gradle index 50abb710f..0a5ed286e 100644 --- a/illadownload/build.gradle +++ b/illadownload/build.gradle @@ -15,10 +15,13 @@ */ import com.install4j.gradle.Install4jTask +plugins { + id 'org.openjfx.javafxplugin' version '0.0.8' +} + apply plugin: 'java' apply plugin: 'application' apply plugin: 'maven-publish' -apply from: '../javafx.plugin' apply from: '../versions.gradle' apply plugin: 'install4j' @@ -30,37 +33,38 @@ archivesBaseName = 'illarion_download' mainClassName = 'illarion.download.Application' dependencies { - compile project(':common') - compile group: 'org.slf4j', name: 'slf4j-api', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'jul-to-slf4j', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'jcl-over-slf4j', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'log4j-over-slf4j', version: project.ext.slf4jVersion - compile group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion - compile group: 'org.ogce', name: 'xpp3', version: '1.1.6' - compile group: 'org.bushe', name: 'eventbus', version: '1.4' - compile group: 'com.google.guava', name: 'guava', version: '21.0' - compile group: 'org.eclipse.aether', name: 'aether-api', version: '1.1.0' - compile group: 'org.eclipse.aether', name: 'aether-connector-basic', version: '1.1.0' - compile group: 'org.eclipse.aether', name: 'aether-transport-http', version: '1.1.0' - compile group: 'org.apache.maven', name: 'maven-aether-provider', version: '3.3.9' + implementation project(':common') + implementation group: 'org.slf4j', name: 'slf4j-api', version: project.ext.slf4jVersion + implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: project.ext.slf4jVersion + implementation group: 'org.slf4j', name: 'jcl-over-slf4j', version: project.ext.slf4jVersion + implementation group: 'org.slf4j', name: 'log4j-over-slf4j', version: project.ext.slf4jVersion + implementation group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion + implementation group: 'org.ogce', name: 'xpp3', version: '1.1.6' + implementation group: 'org.bushe', name: 'eventbus', version: '1.4' + implementation group: 'com.google.guava', name: 'guava', version: '21.0' + implementation group: 'org.eclipse.aether', name: 'aether-api', version: '1.1.0' + implementation group: 'org.eclipse.aether', name: 'aether-connector-basic', version: '1.1.0' + implementation group: 'org.eclipse.aether', name: 'aether-transport-http', version: '1.1.0' + implementation group: 'org.apache.maven', name: 'maven-aether-provider', version: '3.3.9' } jar { dependsOn { gitVersion } manifest { - attributes \ - 'Main-Class': 'illarion.download.gui.GuiApplication', \ - 'JavaFX-Feature-Proxy': 'None', \ - 'Permissions': 'all-permissions', \ - 'Codebase': 'illarion.org', \ - 'Application-Name': 'Illarion Launcher', \ - 'Application-Library-Allowable-Codebase': 'illarion.org', \ - 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), \ - 'Built-By': System.getProperty('user.name'), \ - 'Built-JDK': System.getProperty('java.version'), \ - 'Implementation-Title': 'Illarion Launcher', \ - 'Implementation-Vendor': 'Illarion e.V.',\ - 'Implementation-Version': project.ext.fullVersion + attributes( + 'Main-Class': 'illarion.download.gui.GuiApplication', + 'JavaFX-Feature-Proxy': 'None', + 'Permissions': 'all-permissions', + 'Codebase': 'illarion.org', + 'Application-Name': 'Illarion Launcher', + 'Application-Library-Allowable-Codebase': 'illarion.org', + 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), + 'Built-By': System.getProperty('user.name'), + 'Built-JDK': System.getProperty('java.version'), + 'Implementation-Title': 'Illarion Launcher', + 'Implementation-Vendor': 'Illarion e.V.', + 'Implementation-Version': project.ext.fullVersion + ) } } @@ -77,55 +81,12 @@ if (hasInstall4jTargetDir) { } } -startScripts.dependsOn { - jfxJar -} - javafx { - id 'IllaLauncher' - appID 'IllaLauncher' - appName 'Illarion-Launcher' - mainClass project.mainClassName - - embedLauncher = true + version = '12' + modules = [ 'javafx.controls', 'javafx.fxml' ] + configuration = 'compileOnly' - category = 'Games' - copyright = 'Copyright (c) 2013 Illarion e.V.' description = 'This is the downloader and launcher of Illarion.' - licenseType = 'AGPLv3' - vendor = 'Illarion e.V.' - installSystemWide = false - menu = true - shortcut = true - - if (project.hasProperty('keyFile')) { - apply from: project.keyFile - releaseKey { - alias = project.ext.storealias - keyStore = project.ext.keystore - storePass = project.ext.storepass - storeType = project.ext.storetype - } - signingMode 'release' - } - packaging 'none' - - profiles { - windows { - javaRuntime = '' - } - macosx { - javaRuntime = '' - } - linux { - javaRuntime = '' - } - } - - width = 620 - height = 410 - embedJNLP = true - codebase = 'https://illarion.org/media/java/launcher' } if (hasTargetDistDir) { diff --git a/illadownload/src/main/java/illarion/download/gui/controller/ApplicationController.java b/illadownload/src/main/java/illarion/download/gui/controller/ApplicationController.java index 872ab8d00..59ee52bf6 100644 --- a/illadownload/src/main/java/illarion/download/gui/controller/ApplicationController.java +++ b/illadownload/src/main/java/illarion/download/gui/controller/ApplicationController.java @@ -48,21 +48,19 @@ public void initialize(URL location, ResourceBundle resources) { @Override public void setModel(@Nonnull GuiModel model) { super.setModel(model); - if (getModel().getHostServices().getWebContext() == null) { - rootPane.setOnMousePressed(me -> { - if (me.getButton() != MouseButton.MIDDLE) { - initialX = me.getSceneX(); - initialY = me.getSceneY(); - } - }); + rootPane.setOnMousePressed(me -> { + if (me.getButton() != MouseButton.MIDDLE) { + initialX = me.getSceneX(); + initialY = me.getSceneY(); + } + }); - rootPane.setOnMouseDragged(me -> { - if (me.getButton() != MouseButton.MIDDLE) { - getModel().getStage().setX(me.getScreenX() - initialX); - getModel().getStage().setY(me.getScreenY() - initialY); - } - }); - } + rootPane.setOnMouseDragged(me -> { + if (me.getButton() != MouseButton.MIDDLE) { + getModel().getStage().setX(me.getScreenX() - initialX); + getModel().getStage().setY(me.getScreenY() - initialY); + } + }); } @FXML diff --git a/illadownload/src/main/java/illarion/download/gui/view/ApplicationView.java b/illadownload/src/main/java/illarion/download/gui/view/ApplicationView.java index 213f28a7f..d0b74a6c0 100644 --- a/illadownload/src/main/java/illarion/download/gui/view/ApplicationView.java +++ b/illadownload/src/main/java/illarion/download/gui/view/ApplicationView.java @@ -35,21 +35,9 @@ class ApplicationView extends AnchorPane implements SceneUpdater { private static final Logger log = LoggerFactory.getLogger(ApplicationView.class); ApplicationView(@Nonnull GuiModel model) throws IOException { - boolean isApplet; - try { - isApplet = model.getHostServices().getWebContext() != null; - } catch (Exception e) { - isApplet = false; - } - Parent root = Util.loadFXML("applicationFrame.fxml", model, Util.loadResourceBundle("applicationFrame")); - if (isApplet) { - root.getStyleClass().add("applet"); - getHeader().setVisible(false); - } else { - root.getStyleClass().add("application"); - } + root.getStyleClass().add("application"); getChildren().add(root); maximizeOnAnchorPane(root); @@ -74,11 +62,6 @@ private Pane getFooterPane() { return (Pane) lookupRequiredNode("#footer"); } - @Nonnull - private Node getHeader() { - return lookupRequiredNode("#header"); - } - final void setContent(@Nonnull Node content, @Nonnull Node footer) { getContentPane().getChildren().add(content); getFooterPane().getChildren().add(footer); diff --git a/illaeasynpc/build.gradle b/illaeasynpc/build.gradle index ed5705785..b556e6550 100644 --- a/illaeasynpc/build.gradle +++ b/illaeasynpc/build.gradle @@ -42,22 +42,22 @@ configurations { } dependencies { - compile project(':common') - compile group: 'org.slf4j', name: 'slf4j-api', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'jul-to-slf4j', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'jcl-over-slf4j', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'log4j-over-slf4j', version: project.ext.slf4jVersion - compile group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion - compile group: 'org.bushe', name: 'eventbus', version: '1.4' - compile group: 'com.github.insubstantial', name: 'substance', version: project.ext.insubstantialVersion - compile group: 'com.github.insubstantial', name: 'substance-flamingo', version: project.ext.insubstantialVersion - compile group: 'com.fifesoft', name: 'rsyntaxtextarea', version: '2.6.1' - compile group: 'com.fifesoft', name: 'autocomplete', version: '2.6.1' - compile group: 'org.antlr', name: 'antlr4-runtime', version: '4.7' + implementation project(':common') + implementation group: 'org.slf4j', name: 'slf4j-api', version: project.ext.slf4jVersion + implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: project.ext.slf4jVersion + implementation group: 'org.slf4j', name: 'jcl-over-slf4j', version: project.ext.slf4jVersion + implementation group: 'org.slf4j', name: 'log4j-over-slf4j', version: project.ext.slf4jVersion + implementation group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion + implementation group: 'org.bushe', name: 'eventbus', version: '1.4' + implementation group: 'com.github.insubstantial', name: 'substance', version: project.ext.insubstantialVersion + implementation group: 'com.github.insubstantial', name: 'substance-flamingo', version: project.ext.insubstantialVersion + implementation group: 'com.fifesoft', name: 'rsyntaxtextarea', version: '2.6.1' + implementation group: 'com.fifesoft', name: 'autocomplete', version: '2.6.1' + implementation group: 'org.antlr', name: 'antlr4-runtime', version: '4.7' antlr4 group: 'org.antlr', name: 'antlr4', version: '4.7' - runtime group: 'org.illarion', name: 'rsc_tables', version: project.ext.illarionResourcesVersion + runtimeOnly group: 'org.illarion', name: 'rsc_tables', version: project.ext.illarionResourcesVersion } task antlrOutputDir { @@ -83,11 +83,6 @@ task generateGrammarSource(dependsOn: antlrOutputDir, type: JavaExec) { } -tasks.withType(FindBugs) { - exclude '**/illarion/easynpc/grammar/*' - excludeFilter = file("$projectDir/findbugs-exclude.xml") -} - tasks.withType(Pmd) { exclude '**/illarion/easynpc/grammar/*' } @@ -100,18 +95,19 @@ compileJava { jar { dependsOn { gitVersion } manifest { - attributes \ - 'Main-Class': 'illarion.easynpc.gui.MainFrame', \ - 'Permissions': 'all-permissions', \ - 'Codebase': 'illarion.org', \ - 'Application-Name': 'Illarion easyNPC editor', \ - 'Application-Library-Allowable-Codebase': 'illarion.org', \ - 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), \ - 'Built-By': System.getProperty('user.name'), \ - 'Built-JDK': System.getProperty('java.version'), \ - 'Implementation-Title': 'Illarion easyNPC Editor', \ - 'Implementation-Vendor': 'Illarion e.V.', \ + attributes( + 'Main-Class': 'illarion.easynpc.gui.MainFrame', + 'Permissions': 'all-permissions', + 'Codebase': 'illarion.org', + 'Application-Name': 'Illarion easyNPC editor', + 'Application-Library-Allowable-Codebase': 'illarion.org', + 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), + 'Built-By': System.getProperty('user.name'), + 'Built-JDK': System.getProperty('java.version'), + 'Implementation-Title': 'Illarion easyNPC Editor', + 'Implementation-Vendor': 'Illarion e.V.', 'Implementation-Version': project.ext.fullVersion + ) } } diff --git a/illaeasyquest/build.gradle b/illaeasyquest/build.gradle index a5e819fcf..fad7a189f 100644 --- a/illaeasyquest/build.gradle +++ b/illaeasyquest/build.gradle @@ -23,16 +23,16 @@ archivesBaseName = 'illarion_easyquest' mainClassName = 'illarion.easyquest.gui.MainFrame' dependencies { - compile project(':common') - compile group: 'org.slf4j', name: 'slf4j-api', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'jul-to-slf4j', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'jcl-over-slf4j', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'log4j-over-slf4j', version: project.ext.slf4jVersion - compile group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion - compile group: 'org.bushe', name: 'eventbus', version: '1.4' - compile group: 'com.github.insubstantial', name: 'substance', version: project.ext.insubstantialVersion - compile group: 'com.github.insubstantial', name: 'substance-flamingo', version: project.ext.insubstantialVersion - compile group: 'org.tinyjee.jgraphx', name: 'jgraphx', version: '3.4.1.3' + implementation project(':common') + implementation group: 'org.slf4j', name: 'slf4j-api', version: project.ext.slf4jVersion + implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: project.ext.slf4jVersion + implementation group: 'org.slf4j', name: 'jcl-over-slf4j', version: project.ext.slf4jVersion + implementation group: 'org.slf4j', name: 'log4j-over-slf4j', version: project.ext.slf4jVersion + implementation group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion + implementation group: 'org.bushe', name: 'eventbus', version: '1.4' + implementation group: 'com.github.insubstantial', name: 'substance', version: project.ext.insubstantialVersion + implementation group: 'com.github.insubstantial', name: 'substance-flamingo', version: project.ext.insubstantialVersion + implementation group: 'org.tinyjee.jgraphx', name: 'jgraphx', version: '3.4.1.3' } processResources.dependsOn { @@ -59,18 +59,19 @@ task createFileLists { jar { dependsOn { gitVersion } manifest { - attributes \ - 'Main-Class': 'illarion.easyquest.gui.MainFrame', \ - 'Permissions': 'all-permissions', \ - 'Codebase': 'illarion.org', \ - 'Application-Name': 'Illarion easyQuest editor', \ - 'Application-Library-Allowable-Codebase': 'illarion.org', \ - 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), \ - 'Built-By': System.getProperty('user.name'), \ - 'Built-JDK': System.getProperty('java.version'), \ - 'Implementation-Title': 'Illarion easyQuest Editor', \ - 'Implementation-Vendor': 'Illarion e.V.', \ + attributes( + 'Main-Class': 'illarion.easyquest.gui.MainFrame', + 'Permissions': 'all-permissions', + 'Codebase': 'illarion.org', + 'Application-Name': 'Illarion easyQuest editor', + 'Application-Library-Allowable-Codebase': 'illarion.org', + 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), + 'Built-By': System.getProperty('user.name'), + 'Built-JDK': System.getProperty('java.version'), + 'Implementation-Title': 'Illarion easyQuest Editor', + 'Implementation-Vendor': 'Illarion e.V.', 'Implementation-Version': project.ext.fullVersion + ) } } diff --git a/illagameengine-libgdx/build.gradle b/illagameengine-libgdx/build.gradle index bc3bd2fcc..3b8324f36 100644 --- a/illagameengine-libgdx/build.gradle +++ b/illagameengine-libgdx/build.gradle @@ -13,30 +13,32 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -apply plugin: 'java' +apply plugin: 'java-library' apply plugin: 'maven-publish' +apply from: '../versions.gradle' archivesBaseName = 'illarion_engine_libgdx' dependencies { - compile project(':engine') - compile group: 'com.badlogicgames.gdx', name: 'gdx', version: '1.9.10' - compile group: 'com.badlogicgames.gdx', name: 'gdx-backend-lwjgl', version: '1.9.10' - runtime group: 'com.badlogicgames.gdx', name: 'gdx-platform', version: '1.9.10', classifier: 'natives-desktop' + api project(':engine') + api group: 'com.badlogicgames.gdx', name: 'gdx', version: '1.9.10' + api group: 'com.badlogicgames.gdx', name: 'gdx-backend-lwjgl', version: '1.9.10' + runtimeOnly group: 'com.badlogicgames.gdx', name: 'gdx-platform', version: '1.9.10', classifier: 'natives-desktop' } jar { dependsOn { gitVersion } manifest { - attributes \ - 'Permissions': 'all-permissions', \ - 'Codebase': 'illarion.org', \ - 'Trusted-Library': true, \ - 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), \ - 'Built-By': System.getProperty('user.name'), \ - 'Built-JDK': System.getProperty('java.version'), \ - 'Implementation-Title': 'Illarion Game Engine - libGDX Backend', \ - 'Implementation-Vendor': 'Illarion e.V.', \ - 'Implementation-Version': project.ext.fullVersion + attributes( + 'Permissions': 'all-permissions', + 'Codebase': 'illarion.org', + 'Trusted-Library': true, + 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), + 'Built-By': System.getProperty('user.name'), + 'Built-JDK': System.getProperty('java.version'), + 'Implementation-Title': 'Illarion Game Engine - libGDX Backend', + 'Implementation-Vendor': 'Illarion e.V.', + 'Implementation-Version': project.ext.fullVersion + ) } } diff --git a/illagameengine-nifty/build.gradle b/illagameengine-nifty/build.gradle index c87190639..babb74790 100644 --- a/illagameengine-nifty/build.gradle +++ b/illagameengine-nifty/build.gradle @@ -13,31 +13,32 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -apply plugin: 'java' +apply plugin: 'java-library' apply plugin: 'maven-publish' apply from: '../versions.gradle' archivesBaseName = 'illarion_engine_nifty' dependencies { - compile project(':common') - compile project(':engine') - compile group: 'com.github.nifty-gui', name: 'nifty', version: project.ext.niftyGuiVersion + api project(':common') + api project(':engine') + api group: 'com.github.nifty-gui', name: 'nifty', version: project.ext.niftyGuiVersion } jar { dependsOn { gitVersion } manifest { - attributes \ - 'Permissions': 'all-permissions', \ - 'Codebase': 'illarion.org', \ - 'Trusted-Library': true, \ - 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), \ - 'Built-By': System.getProperty('user.name'), \ - 'Built-JDK': System.getProperty('java.version'), \ - 'Implementation-Title': 'Illarion Game Engine - Nifty-GUI Implementation', \ - 'Implementation-Vendor': 'Illarion e.V.', \ - 'Implementation-Version': project.ext.fullVersion + attributes( + 'Permissions': 'all-permissions', + 'Codebase': 'illarion.org', + 'Trusted-Library': true, + 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), + 'Built-By': System.getProperty('user.name'), + 'Built-JDK': System.getProperty('java.version'), + 'Implementation-Title': 'Illarion Game Engine - Nifty-GUI Implementation', + 'Implementation-Vendor': 'Illarion e.V.', + 'Implementation-Version': project.ext.fullVersion + ) } } diff --git a/illagameengine/build.gradle b/illagameengine/build.gradle index 7f7060ca2..38aa11fac 100644 --- a/illagameengine/build.gradle +++ b/illagameengine/build.gradle @@ -13,27 +13,29 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -apply plugin: 'java' +apply plugin: 'java-library' apply plugin: 'maven-publish' archivesBaseName = 'illarion_engine' dependencies { - compile project(':common') + api project(':common') + implementation group: 'xmlpull', name: 'xmlpull', version: '1.1.3.1' } jar { dependsOn { gitVersion } manifest { - attributes \ - 'Permissions': 'all-permissions', \ - 'Codebase': 'illarion.org', \ - 'Trusted-Library': true, \ - 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), \ - 'Built-By': System.getProperty('user.name'), \ - 'Built-JDK': System.getProperty('java.version'), \ - 'Implementation-Title': 'Illarion Game Engine', \ - 'Implementation-Vendor': 'Illarion e.V.', \ - 'Implementation-Version': project.ext.fullVersion + attributes( + 'Permissions': 'all-permissions', + 'Codebase': 'illarion.org', + 'Trusted-Library': true, + 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), + 'Built-By': System.getProperty('user.name'), + 'Built-JDK': System.getProperty('java.version'), + 'Implementation-Title': 'Illarion Game Engine', + 'Implementation-Vendor': 'Illarion e.V.', + 'Implementation-Version': project.ext.fullVersion + ) } } diff --git a/illamapedit/build.gradle b/illamapedit/build.gradle index 1f67f43f9..2116abb6d 100644 --- a/illamapedit/build.gradle +++ b/illamapedit/build.gradle @@ -23,40 +23,41 @@ archivesBaseName = 'illarion_mapedit' mainClassName = 'illarion.mapedit.MapEditor' dependencies { - compile project(':common') - compile project(':engine') - compile group: 'org.slf4j', name: 'slf4j-api', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'jul-to-slf4j', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'jcl-over-slf4j', version: project.ext.slf4jVersion - compile group: 'org.slf4j', name: 'log4j-over-slf4j', version: project.ext.slf4jVersion - compile group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion - compile group: 'net.sf.trove4j', name: 'trove4j', version: '3.0.3' - compile group: 'org.bushe', name: 'eventbus', version: '1.4' - compile group: 'com.googlecode.soundlibs', name: 'vorbisspi', version: '1.0.3.3' - compile group: 'com.github.insubstantial', name: 'substance', version: project.ext.insubstantialVersion - compile group: 'com.github.insubstantial', name: 'substance-flamingo', version: project.ext.insubstantialVersion - compile group: 'com.github.insubstantial', name: 'substance-swingx', version: project.ext.insubstantialVersion - runtime group: 'org.illarion', name: 'rsc_items', version: project.ext.illarionResourcesVersion - runtime group: 'org.illarion', name: 'rsc_music', version: project.ext.illarionResourcesVersion - runtime group: 'org.illarion', name: 'rsc_tables', version: project.ext.illarionResourcesVersion - runtime group: 'org.illarion', name: 'rsc_tiles', version: project.ext.illarionResourcesVersion + implementation project(':common') + implementation project(':engine') + implementation group: 'org.slf4j', name: 'slf4j-api', version: project.ext.slf4jVersion + implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: project.ext.slf4jVersion + implementation group: 'org.slf4j', name: 'jcl-over-slf4j', version: project.ext.slf4jVersion + implementation group: 'org.slf4j', name: 'log4j-over-slf4j', version: project.ext.slf4jVersion + implementation group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion + implementation group: 'net.sf.trove4j', name: 'trove4j', version: '3.0.3' + implementation group: 'org.bushe', name: 'eventbus', version: '1.4' + implementation group: 'com.googlecode.soundlibs', name: 'vorbisspi', version: '1.0.3.3' + implementation group: 'com.github.insubstantial', name: 'substance', version: project.ext.insubstantialVersion + implementation group: 'com.github.insubstantial', name: 'substance-flamingo', version: project.ext.insubstantialVersion + implementation group: 'com.github.insubstantial', name: 'substance-swingx', version: project.ext.insubstantialVersion + runtimeOnly group: 'org.illarion', name: 'rsc_items', version: project.ext.illarionResourcesVersion + runtimeOnly group: 'org.illarion', name: 'rsc_music', version: project.ext.illarionResourcesVersion + runtimeOnly group: 'org.illarion', name: 'rsc_tables', version: project.ext.illarionResourcesVersion + runtimeOnly group: 'org.illarion', name: 'rsc_tiles', version: project.ext.illarionResourcesVersion } jar { dependsOn { gitVersion } manifest { - attributes \ - 'Main-Class': 'illarion.mapedit.MapEditor', \ - 'Permissions': 'all-permissions', \ - 'Codebase': 'illarion.org', \ - 'Application-Name': 'Illarion Mapeditor', \ - 'Application-Library-Allowable-Codebase': 'illarion.org', \ - 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), \ - 'Built-By': System.getProperty('user.name'), \ - 'Built-JDK': System.getProperty('java.version'), \ - 'Implementation-Title': 'Illarion Mapeditor', \ - 'Implementation-Vendor': 'Illarion e.V.', \ - 'Implementation-Version': project.ext.fullVersion + attributes( + 'Main-Class': 'illarion.mapedit.MapEditor', + 'Permissions': 'all-permissions', + 'Codebase': 'illarion.org', + 'Application-Name': 'Illarion Mapeditor', + 'Application-Library-Allowable-Codebase': 'illarion.org', + 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), + 'Built-By': System.getProperty('user.name'), + 'Built-JDK': System.getProperty('java.version'), + 'Implementation-Title': 'Illarion Mapeditor', + 'Implementation-Vendor': 'Illarion e.V.', + 'Implementation-Version': project.ext.fullVersion + ) } } diff --git a/javafx.plugin b/javafx.plugin deleted file mode 100644 index 9f747c4f4..000000000 --- a/javafx.plugin +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Bootstrap script for the Gradle JavaFX Plugin. - * (based on http://plugins.jasoft.fi/vaadin.plugin) - * - * The script will add the latest version of the plugin to the build script - * dependencies and apply the plugin to the project. If you do not want - * this behavior you can copy and paste the below configuration into your - * own build script and define your own repository and version for the plugin. - */ - -import org.gradle.api.GradleException; - - - -buildscript { - repositories { - mavenLocal() - maven { - name = 'BinTray' - url = 'http://dl.bintray.com/content/shemnon/javafx-gradle/' - } - maven { - name = 'CloudBees Snapshot' - url = 'http://repository-javafx-gradle-plugin.forge.cloudbees.com/snapshot' - } - ivy { - url = 'http://repository-javafx-gradle-plugin.forge.cloudbees.com/snapshot' - } - mavenCentral() - } - dependencies { - try { - assert (jfxrtDir != null) - } catch (RuntimeException re) { - ext.jfxrtDir = "." - } - - ext.searchFile = {Map places, List searchPaths, String searchID -> - File result = null; - places.each { k, v -> - if (result != null) return; - project.logger.debug("Looking for $searchID in $k") - def dir = v() - if (dir == null) { - project.logger.debug("$k not set") - } else { - project.logger.debug("$k is $dir") - searchPaths.each { s -> - if (result != null) return; - File f = new File(dir, s); - project.logger.debug("Trying $f.path") - if (f.exists() && f.file) { - project.logger.debug("found $searchID as $result") - result = f; - } - } - } - } - if (!result?.file) { - throw new GradleException("Could not find $searchID, please set one of ${places.keySet()}"); - } else { - project.logger.info("$searchID: ${result}") - return result - } - } - ext.findJFXJar = { - return searchFile([ - 'jfxrtDir in Gradle Properties': {jfxrtDir}, - 'JFXRT_HOME in System Environment': {System.env['JFXRT_HOME']}, - 'JAVA_HOME in System Environment': {System.env['JAVA_HOME']}, - 'java.home in JVM properties': {System.properties['java.home']} - ], - ['jfxrt.jar', 'lib/jfxrt.jar', 'lib/ext/jfxrt.jar', 'jre/lib/jfxrt.jar', 'jre/lib/ext/jfxrt.jar'], - 'JavaFX Runtime Jar') - } - - ext.findAntJavaFXJar = { - return searchFile([ - 'jfxrtDir in Gradle Properties': {jfxrtDir}, - 'JFXRT_HOME in System Environment': {System.env['JFXRT_HOME']}, - 'JAVA_HOME in System Environment': {System.env['JAVA_HOME']}, - 'java.home in JVM properties': {System.properties['java.home']} - ], - ['ant-javafx.jar', 'lib/ant-javafx.jar', '../lib/ant-javafx.jar'], - 'JavaFX Packager Tools') - } - - - classpath 'org.bitbucket.shemnon.javafxplugin:gradle-javafx-plugin:8.1.1' - classpath project.files(findAntJavaFXJar()) - classpath project.files(findJFXJar()) - } -} - -if (!project.plugins.findPlugin(org.bitbucket.shemnon.javafxplugin.JavaFXPlugin)) { - project.apply(plugin: org.bitbucket.shemnon.javafxplugin.JavaFXPlugin) -} \ No newline at end of file diff --git a/nifty-controls-illarion/build.gradle b/nifty-controls-illarion/build.gradle index d733a56a8..67697d54b 100644 --- a/nifty-controls-illarion/build.gradle +++ b/nifty-controls-illarion/build.gradle @@ -13,7 +13,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -apply plugin: 'java' +apply plugin: 'java-library' apply plugin: 'maven-publish' apply from: '../versions.gradle' @@ -21,24 +21,25 @@ apply from: '../versions.gradle' archivesBaseName = 'nifty-controls-illarion' dependencies { - compile project(':common') - compile group: 'com.github.nifty-gui', name: 'nifty', version: project.ext.niftyGuiVersion - compile group: 'com.github.nifty-gui', name: 'nifty-default-controls', version: project.ext.niftyGuiVersion + api project(':common') + api group: 'com.github.nifty-gui', name: 'nifty', version: project.ext.niftyGuiVersion + api group: 'com.github.nifty-gui', name: 'nifty-default-controls', version: project.ext.niftyGuiVersion } jar { dependsOn { gitVersion } manifest { - attributes \ - 'Permissions': 'all-permissions', \ - 'Codebase': 'illarion.org', \ - 'Trusted-Library': true, \ - 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), \ - 'Built-By': System.getProperty('user.name'), \ - 'Built-JDK': System.getProperty('java.version'), \ - 'Implementation-Title': 'Illarion Nifty-GUI Controls', \ - 'Implementation-Vendor': 'Illarion e.V.', \ - 'Implementation-Version': project.ext.fullVersion + attributes( + 'Permissions': 'all-permissions', + 'Codebase': 'illarion.org', + 'Trusted-Library': true, + 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), + 'Built-By': System.getProperty('user.name'), + 'Built-JDK': System.getProperty('java.version'), + 'Implementation-Title': 'Illarion Nifty-GUI Controls', + 'Implementation-Vendor': 'Illarion e.V.', + 'Implementation-Version': project.ext.fullVersion + ) } } diff --git a/nifty-controls-illarion/src/main/java/org/illarion/nifty/controls/dialog/message/builder/DialogMessageBuilder.java b/nifty-controls-illarion/src/main/java/org/illarion/nifty/controls/dialog/message/builder/DialogMessageBuilder.java index cad472ca4..4d692079e 100644 --- a/nifty-controls-illarion/src/main/java/org/illarion/nifty/controls/dialog/message/builder/DialogMessageBuilder.java +++ b/nifty-controls-illarion/src/main/java/org/illarion/nifty/controls/dialog/message/builder/DialogMessageBuilder.java @@ -16,6 +16,7 @@ package org.illarion.nifty.controls.dialog.message.builder; import de.lessvoid.nifty.builder.ControlBuilder; +import de.lessvoid.nifty.builder.ElementBuilder; import javax.annotation.Nonnull; @@ -47,8 +48,9 @@ public DialogMessageBuilder(@Nonnull String id, @Nonnull String title) { * @param text the text displayed in this dialog */ @Override - public void text(@Nonnull String text) { + public ElementBuilder text(@Nonnull String text) { set("text", text); + return this; } /** diff --git a/nifty-style-illarion/build.gradle b/nifty-style-illarion/build.gradle index 8f943a4fa..25d5aa951 100644 --- a/nifty-style-illarion/build.gradle +++ b/nifty-style-illarion/build.gradle @@ -21,16 +21,17 @@ archivesBaseName = 'nifty-style-illarion' jar { dependsOn { gitVersion } manifest { - attributes \ - 'Permissions': 'all-permissions', \ - 'Codebase': 'illarion.org', \ - 'Trusted-Library': true, \ - 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), \ - 'Built-By': System.getProperty('user.name'), \ - 'Built-JDK': System.getProperty('java.version'), \ - 'Implementation-Title': 'Illarion Nifty-GUI Style', \ - 'Implementation-Vendor': 'Illarion e.V.', \ - 'Implementation-Version': project.ext.fullVersion + attributes( + 'Permissions': 'all-permissions', + 'Codebase': 'illarion.org', + 'Trusted-Library': true, + 'Built-Date': new Date().format('yyyy-MM-dd HH:mm:ssZ'), + 'Built-By': System.getProperty('user.name'), + 'Built-JDK': System.getProperty('java.version'), + 'Implementation-Title': 'Illarion Nifty-GUI Style', + 'Implementation-Vendor': 'Illarion e.V.', + 'Implementation-Version': project.ext.fullVersion + ) } } diff --git a/pmd.xml b/pmd.xml index b2cb82e0c..e9f3ececd 100644 --- a/pmd.xml +++ b/pmd.xml @@ -14,36 +14,32 @@ ~ GNU General Public License for more details. --> - - This is the PMD ruleset for Illarion. - + xmlns="http://pmd.sourceforge.net/ruleset/2.0.0" + xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd"> + This is the PMD ruleset for Illarion. - - - - - - - - - - - - - - - - - - - + + .*/ant/java/EncodingTestClass.java + .*/net/sourceforge/pmd/cpd/badandgood/BadFile.java - - - - - + + .*/net/sourceforge/pmd/lang/java/ast/jdkversiontests/assert_test5.java + .*/net/sourceforge/pmd/lang/java/ast/jdkversiontests/assert_test5_a.java + .*/net/sourceforge/pmd/lang/java/ast/jdkversiontests/assert_test7.java + .*/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk14_enum.java + .*/net/sourceforge/pmd/lang/java/ast/jdkversiontests/jdk9_invalid_identifier.java + .*/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java10/LocalVariableTypeInference_varAsAnnotationName.java + .*/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java10/LocalVariableTypeInference_varAsEnumName.java + .*/net/sourceforge/pmd/lang/java/ast/jdkversiontests/java10/LocalVariableTypeInference_varAsTypeIdentifier.java + + + + + + + + + diff --git a/settings.gradle b/settings.gradle index 06989665e..a6e8d84b3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -31,43 +31,43 @@ rootProject.name = "illarion" rootProject.children.each { switch (it.name) { case "illabuild": - it.name = "build"; - break; + it.name = "build" + break case "illaclient": - it.name = "client"; - break; + it.name = "client" + break case "illacommon": - it.name = "common"; - break; + it.name = "common" + break case "illacompiler": - it.name = "compiler"; - break; + it.name = "compiler" + break case "illadownload": - it.name = "download"; - break; + it.name = "download" + break case "illaeasynpc": - it.name = "easynpc"; - break; + it.name = "easynpc" + break case "illaeasyquest": - it.name = "easyquest"; - break; + it.name = "easyquest" + break case "illagameengine": - it.name = "engine"; - break; + it.name = "engine" + break case "illagameengine-libgdx": - it.name = "engine-libgdx"; - break; + it.name = "engine-libgdx" + break case "illagameengine-nifty": - it.name = "engine-nifty"; - break; + it.name = "engine-nifty" + break case "illamapedit": - it.name = "mapeditor"; - break; + it.name = "mapeditor" + break case "nifty-controls-illarion": - it.name = "nifty-controls"; - break; + it.name = "nifty-controls" + break case "nifty-style-illarion": - it.name = "nifty-style"; - break; + it.name = "nifty-style" + break } } \ No newline at end of file diff --git a/versions.gradle b/versions.gradle index 4ce1a48ee..69b8720f9 100644 --- a/versions.gradle +++ b/versions.gradle @@ -14,10 +14,10 @@ * GNU General Public License for more details. */ ext { - slf4jVersion = '1.7.25' - logbackVersion = '1.2.2' - janinoVersion = '3.0.7' + slf4jVersion = '1.7.30' + logbackVersion = '1.2.3' + janinoVersion = '3.1.2' illarionResourcesVersion = '2.1.25.13-SNAPSHOT' - niftyGuiVersion = '1.4.2' + niftyGuiVersion = '1.4.3' insubstantialVersion = '7.3' } From 5dd2e893648790877d128c5e9d8bffeb8b52ecd8 Mon Sep 17 00:00:00 2001 From: r-lodahl Date: Thu, 13 Aug 2020 18:25:30 +0200 Subject: [PATCH 3/8] Update to Gradle 6.6 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index b6d74c8f7..27fe5a4d3 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ plugins { } wrapper { - gradleVersion = '6.3' + gradleVersion = '6.6' } idea { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4b442974..6c9a22477 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 7ca9474c6a6a88821057503bc3d7d986c2fd9f2d Mon Sep 17 00:00:00 2001 From: r-lodahl Date: Thu, 13 Aug 2020 18:25:48 +0200 Subject: [PATCH 4/8] Fix deprecation warning --- .../src/main/java/illarion/common/memory/MemoryPool.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/illacommon/src/main/java/illarion/common/memory/MemoryPool.java b/illacommon/src/main/java/illarion/common/memory/MemoryPool.java index e9947fb62..d8859c825 100644 --- a/illacommon/src/main/java/illarion/common/memory/MemoryPool.java +++ b/illacommon/src/main/java/illarion/common/memory/MemoryPool.java @@ -3,6 +3,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.lang.reflect.InvocationTargetException; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; @@ -26,8 +27,8 @@ public T get (Class cls) { if (obj == null) { // There is no free object in queue --> allocate a new one try { - obj = cls.newInstance(); - } catch (InstantiationException | IllegalAccessException e) { + obj = cls.getDeclaredConstructor().newInstance(); + } catch (NoSuchMethodException | InvocationTargetException |InstantiationException | IllegalAccessException e) { throw new MemoryAllocatorException(cls, e); } } From fca1efcb0b4cf75b07ea7c19790871c357b86e7b Mon Sep 17 00:00:00 2001 From: r-lodahl Date: Thu, 13 Aug 2020 18:26:21 +0200 Subject: [PATCH 5/8] Unmodularize the downloader --- illadownload/build.gradle | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/illadownload/build.gradle b/illadownload/build.gradle index 0a5ed286e..b63c6a942 100644 --- a/illadownload/build.gradle +++ b/illadownload/build.gradle @@ -16,11 +16,11 @@ import com.install4j.gradle.Install4jTask plugins { + id 'application' id 'org.openjfx.javafxplugin' version '0.0.8' } apply plugin: 'java' -apply plugin: 'application' apply plugin: 'maven-publish' apply from: '../versions.gradle' apply plugin: 'install4j' @@ -52,7 +52,7 @@ jar { dependsOn { gitVersion } manifest { attributes( - 'Main-Class': 'illarion.download.gui.GuiApplication', + 'Main-Class': 'illarion.download.Application', 'JavaFX-Feature-Proxy': 'None', 'Permissions': 'all-permissions', 'Codebase': 'illarion.org', @@ -66,6 +66,9 @@ jar { 'Implementation-Version': project.ext.fullVersion ) } + from { + configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } + } } task publishDownloaderBundle() {} @@ -82,11 +85,7 @@ if (hasInstall4jTargetDir) { } javafx { - version = '12' modules = [ 'javafx.controls', 'javafx.fxml' ] - configuration = 'compileOnly' - - description = 'This is the downloader and launcher of Illarion.' } if (hasTargetDistDir) { From ddeb832c5b60efbaf88fa612864cd2e17a4bc0ea Mon Sep 17 00:00:00 2001 From: r-lodahl Date: Thu, 13 Aug 2020 19:35:23 +0200 Subject: [PATCH 6/8] Switched to https for maven central --- .../src/main/java/illarion/download/maven/MavenDownloader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/illadownload/src/main/java/illarion/download/maven/MavenDownloader.java b/illadownload/src/main/java/illarion/download/maven/MavenDownloader.java index 9df94dce5..a52debbea 100644 --- a/illadownload/src/main/java/illarion/download/maven/MavenDownloader.java +++ b/illadownload/src/main/java/illarion/download/maven/MavenDownloader.java @@ -272,7 +272,7 @@ public Collection downloadArtifact( } private void setupRepositories() { - repositories.add(setupRepository("central", "http://repo1.maven.org/maven2/", + repositories.add(setupRepository("central", "https://repo1.maven.org/maven2/", setupRepository("ibiblio.org", "http://mirrors.ibiblio.org/maven2/"), setupRepository("antelink", ".com/content/repositories/central/"), setupRepository("exist", "http://repo.exist.com/maven2/"), From 57c2dbb93d8095cfba017c03cd7976ba048d1d24 Mon Sep 17 00:00:00 2001 From: r-lodahl Date: Thu, 13 Aug 2020 19:36:14 +0200 Subject: [PATCH 7/8] Updated java version checks to java 14 --- .../java/illarion/download/launcher/JavaLauncher.java | 10 ++++------ .../launcher/MacOsXJavaExecutableIterable.java | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/illadownload/src/main/java/illarion/download/launcher/JavaLauncher.java b/illadownload/src/main/java/illarion/download/launcher/JavaLauncher.java index 5b18eefc1..b1a610b46 100644 --- a/illadownload/src/main/java/illarion/download/launcher/JavaLauncher.java +++ b/illadownload/src/main/java/illarion/download/launcher/JavaLauncher.java @@ -111,9 +111,9 @@ private static boolean isJavaExecutableWorking(@Nonnull Path executable) { try (BufferedReader reader = new BufferedReader( new InputStreamReader(process.getInputStream(), Charset.defaultCharset()))) { - Pattern versionRegex = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)_(\\d+)"); + Pattern versionRegex = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)"); Optional versionMatcher = reader.lines() - .filter(s -> s.startsWith("java version")) + .filter(s -> s.contains("version")) .map(versionRegex::matcher) .filter(Matcher::find) .findFirst(); @@ -123,12 +123,10 @@ private static boolean isJavaExecutableWorking(@Nonnull Path executable) { int mainVersion = Integer.parseInt(matcher.group(1)); int majorVersion = Integer.parseInt(matcher.group(2)); int minorVersion = Integer.parseInt(matcher.group(3)); - int buildNumber = Integer.parseInt(matcher.group(4)); - log.info("Matched Java version to {}.{}.{}_b{}", - mainVersion, majorVersion, minorVersion, buildNumber); + log.info("Matched Java version to {}.{}.{}", mainVersion, majorVersion, minorVersion); - return (mainVersion >= 1) && (majorVersion >= 8) && (buildNumber >= 0); + return (mainVersion >= 14) && (majorVersion >= 0); } } finally { process.destroy(); diff --git a/illadownload/src/main/java/illarion/download/launcher/MacOsXJavaExecutableIterable.java b/illadownload/src/main/java/illarion/download/launcher/MacOsXJavaExecutableIterable.java index 213ce2b58..8f83bf7e5 100644 --- a/illadownload/src/main/java/illarion/download/launcher/MacOsXJavaExecutableIterable.java +++ b/illadownload/src/main/java/illarion/download/launcher/MacOsXJavaExecutableIterable.java @@ -144,7 +144,7 @@ private Path getJavaHomeDirectory() { javaHomeDirectoryFetched = true; LOGGER.warn("Platform independent locating tries for java executable failed. Entering MacOS mode."); try { - ProcessBuilder processBuilder = new ProcessBuilder("/usr/libexec/java_home", "-v", "1.7"); + ProcessBuilder processBuilder = new ProcessBuilder("/usr/libexec/java_home", "-v", "14"); processBuilder.redirectErrorStream(true); Process process = processBuilder.start(); //noinspection resource From a7df1a863b4ba57e0df2711b55cc7d3cf7a21ea6 Mon Sep 17 00:00:00 2001 From: r-lodahl Date: Mon, 7 Dec 2020 10:24:28 +0100 Subject: [PATCH 8/8] version upgrade java 14 -> 15 gradle 6.6 -> 6.7.1 testng 7.1 -> 7.3 powermock 2.0.7 -> 2.0.9 jetbrains annotations 19.0.0 -> 20.1.0 guava 21.0 -> 30.0-jre rsyntaxtextarea 2.6.1 -> 3.1.0 autocomplete 2.6.1 -> 3.1.0 antlr4 4.7 -> 4.9 libgdx 1.9.10 -> 1.9.12 --- build.gradle | 20 ++++++++++---------- gradle/wrapper/gradle-wrapper.jar | Bin 58694 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 ++ gradlew.bat | 22 ++++------------------ illadownload/build.gradle | 2 +- illaeasynpc/build.gradle | 8 ++++---- illagameengine-libgdx/build.gradle | 6 +++--- 8 files changed, 25 insertions(+), 37 deletions(-) diff --git a/build.gradle b/build.gradle index 27fe5a4d3..192392751 100644 --- a/build.gradle +++ b/build.gradle @@ -25,8 +25,8 @@ buildscript { } } dependencies { - classpath group: 'de.undercouch', name: 'gradle-download-task', version: '4.0.4' - classpath group: 'com.install4j', name: 'install4j-gradle', version: '7.0.12' + classpath group: 'de.undercouch', name: 'gradle-download-task', version: '4.1.1' + classpath group: 'com.install4j', name: 'install4j-gradle', version: '8.0.7' } } @@ -35,12 +35,12 @@ plugins { } wrapper { - gradleVersion = '6.6' + gradleVersion = '6.7' } idea { project { - languageLevel = '1.14' + languageLevel = '15' } } @@ -119,8 +119,8 @@ subprojects { group = 'org.illarion' apply plugin: 'java' - sourceCompatibility = JavaVersion.VERSION_14 - targetCompatibility = JavaVersion.VERSION_14 + sourceCompatibility = JavaVersion.VERSION_15 + targetCompatibility = JavaVersion.VERSION_15 plugins.withType(JavaPlugin) { tasks.withType(JavaCompile) { @@ -144,12 +144,12 @@ subprojects { test.runtimeClasspath += configurations.provided } dependencies { - testImplementation group: 'org.testng', name: 'testng', version: '7.1.0' + testImplementation group: 'org.testng', name: 'testng', version: '7.3.0' testImplementation group: 'org.easymock', name: 'easymock', version: '4.2' - testImplementation group: 'org.powermock', name: 'powermock-module-testng', version: '2.0.7' - testImplementation group: 'org.powermock', name: 'powermock-api-easymock', version: '2.0.7' + testImplementation group: 'org.powermock', name: 'powermock-module-testng', version: '2.0.9' + testImplementation group: 'org.powermock', name: 'powermock-api-easymock', version: '2.0.9' testImplementation group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3' - implementation group: 'org.jetbrains', name: 'annotations', version: '19.0.0' + implementation group: 'org.jetbrains', name: 'annotations', version: '20.1.0' } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 490fda8577df6c95960ba7077c43220e5bb2c0d9..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f 100644 GIT binary patch delta 6763 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 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/illadownload/build.gradle b/illadownload/build.gradle index b63c6a942..aca0cff07 100644 --- a/illadownload/build.gradle +++ b/illadownload/build.gradle @@ -41,7 +41,7 @@ dependencies { implementation group: 'ch.qos.logback', name: 'logback-classic', version: project.ext.logbackVersion implementation group: 'org.ogce', name: 'xpp3', version: '1.1.6' implementation group: 'org.bushe', name: 'eventbus', version: '1.4' - implementation group: 'com.google.guava', name: 'guava', version: '21.0' + implementation group: 'com.google.guava', name: 'guava', version: '30.0-jre' implementation group: 'org.eclipse.aether', name: 'aether-api', version: '1.1.0' implementation group: 'org.eclipse.aether', name: 'aether-connector-basic', version: '1.1.0' implementation group: 'org.eclipse.aether', name: 'aether-transport-http', version: '1.1.0' diff --git a/illaeasynpc/build.gradle b/illaeasynpc/build.gradle index b556e6550..b54a9cd13 100644 --- a/illaeasynpc/build.gradle +++ b/illaeasynpc/build.gradle @@ -51,11 +51,11 @@ dependencies { implementation group: 'org.bushe', name: 'eventbus', version: '1.4' implementation group: 'com.github.insubstantial', name: 'substance', version: project.ext.insubstantialVersion implementation group: 'com.github.insubstantial', name: 'substance-flamingo', version: project.ext.insubstantialVersion - implementation group: 'com.fifesoft', name: 'rsyntaxtextarea', version: '2.6.1' - implementation group: 'com.fifesoft', name: 'autocomplete', version: '2.6.1' - implementation group: 'org.antlr', name: 'antlr4-runtime', version: '4.7' + implementation group: 'com.fifesoft', name: 'rsyntaxtextarea', version: '3.1.0' + implementation group: 'com.fifesoft', name: 'autocomplete', version: '3.1.0' + implementation group: 'org.antlr', name: 'antlr4-runtime', version: '4.9' - antlr4 group: 'org.antlr', name: 'antlr4', version: '4.7' + antlr4 group: 'org.antlr', name: 'antlr4', version: '4.9' runtimeOnly group: 'org.illarion', name: 'rsc_tables', version: project.ext.illarionResourcesVersion } diff --git a/illagameengine-libgdx/build.gradle b/illagameengine-libgdx/build.gradle index 3b8324f36..66567e351 100644 --- a/illagameengine-libgdx/build.gradle +++ b/illagameengine-libgdx/build.gradle @@ -20,9 +20,9 @@ apply from: '../versions.gradle' archivesBaseName = 'illarion_engine_libgdx' dependencies { api project(':engine') - api group: 'com.badlogicgames.gdx', name: 'gdx', version: '1.9.10' - api group: 'com.badlogicgames.gdx', name: 'gdx-backend-lwjgl', version: '1.9.10' - runtimeOnly group: 'com.badlogicgames.gdx', name: 'gdx-platform', version: '1.9.10', classifier: 'natives-desktop' + api group: 'com.badlogicgames.gdx', name: 'gdx', version: '1.9.12' + api group: 'com.badlogicgames.gdx', name: 'gdx-backend-lwjgl', version: '1.9.12' + runtimeOnly group: 'com.badlogicgames.gdx', name: 'gdx-platform', version: '1.9.12', classifier: 'natives-desktop' } jar {