From 74e6c80aad79aa162e0b5d11804ea3445d746b2d Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sun, 11 Feb 2024 13:24:08 +0000 Subject: [PATCH] A few buildscript and test tweaks (#281) * Kotlin buildscript for better IDE integration * Fix transitive Bauble dep, move CoreTweaks to a fake-ivy dependency * Don't scan fullscreen modes for window creation * Update GTNHGradle --- addon.gradle | 21 ------------------ build.gradle | 5 ----- build.gradle.kts | 22 +++++++++++++++++++ dependencies.gradle | 9 ++------ repositories.gradle | 19 +++++++++++++++- settings.gradle | 2 +- .../angelica/AngelicaExtension.java | 13 ++--------- 7 files changed, 45 insertions(+), 46 deletions(-) delete mode 100644 addon.gradle delete mode 100644 build.gradle create mode 100644 build.gradle.kts diff --git a/addon.gradle b/addon.gradle deleted file mode 100644 index 8dc8db4db..000000000 --- a/addon.gradle +++ /dev/null @@ -1,21 +0,0 @@ - -test { - useJUnitPlatform() - testLogging { - events "passed", "skipped", "failed" - } - javaLauncher = javaToolchains.launcherFor { - languageVersion = JavaLanguageVersion.of(8) - } - dependsOn("extractNatives2") - jvmArgs += "-Djava.library.path=${tasks.extractNatives2.destinationFolder.asFile.get().path}" -} - - -allprojects { - gradle.projectsEvaluated { - tasks.withType(JavaCompile) { - options.compilerArgs << "-Xmaxerrs" << "2000" - } - } -} diff --git a/build.gradle b/build.gradle deleted file mode 100644 index e57a16f9f..000000000 --- a/build.gradle +++ /dev/null @@ -1,5 +0,0 @@ -//version: 1707058017 - -plugins { - id 'com.gtnewhorizons.gtnhconvention' -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 000000000..e539f383b --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,22 @@ +plugins { + id("com.gtnewhorizons.gtnhconvention") +} + +tasks.test { + useJUnitPlatform() + testLogging { + events("passed", "skipped", "failed") + } + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) + } + dependsOn(tasks.extractNatives2) + jvmArgs("-Djava.library.path=${tasks.extractNatives2.get().destinationFolder.asFile.get().path}") +} + +tasks.register("copyDependencies") { + group = "Angelica" + description = "Collect dependencies into the testDependencies folder" + from(configurations.default) + into("testDependencies") +} diff --git a/dependencies.gradle b/dependencies.gradle index 06c4b6fe9..c24d6a797 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -71,7 +71,7 @@ dependencies { // Notfine Deps compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") - runtimeOnly("com.github.GTNewHorizons:Baubles:1.0.1.16:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:Baubles:1.0.1.16:dev") compileOnly("com.github.GTNewHorizons:twilightforest:2.5.1:dev") {transitive = false } compileOnly(rfg.deobf('curse.maven:witchery-69673:2234410')) @@ -88,7 +88,7 @@ dependencies { // HMMMMM compileOnly(rfg.deobf("curse.maven:journeymap-32274:2367915")) - runtimeOnly(deobf("https://github.com/makamys/CoreTweaks/releases/download/0.3.3.2/CoreTweaks-1.7.10-0.3.3.2+nomixin.jar")) + runtimeOnlyNonPublishable(rfg.deobf("CoreTweaks:CoreTweaks:0.3.3.2")) // Hodgepodge transformedMod("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") @@ -100,8 +100,3 @@ dependencies { testImplementation("org.mockito:mockito-core:3.+") testImplementation("org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209") } - -task copyDependencies(type: Copy) { - from configurations.default - into 'testDependencies' -} diff --git a/repositories.gradle b/repositories.gradle index b8f83453f..e268ed154 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -5,7 +5,24 @@ repositories { name = 'mavenpattern' url = 'https://mvn.falsepattern.com/releases' content { - includeGroup "com.falsepattern" + includeGroup 'com.falsepattern' + } + } + exclusiveContent { + forRepository { + ivy { + name = 'CoreTweaks releases' + url = 'https://github.com/makamys/CoreTweaks/releases/download/' + patternLayout { + artifact '[revision]/[module]-1.7.10-[revision]+nomixin(-[classifier])(.[ext])' + } + metadataSources { + artifact() + } + } + } + filter { + includeGroup('CoreTweaks') } } mavenLocal() diff --git a/settings.gradle b/settings.gradle index 9238315cc..bad79170d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,5 +16,5 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.12' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.13' } diff --git a/src/test/java/com/gtnewhorizons/angelica/AngelicaExtension.java b/src/test/java/com/gtnewhorizons/angelica/AngelicaExtension.java index 88eab97d0..041ad98e8 100644 --- a/src/test/java/com/gtnewhorizons/angelica/AngelicaExtension.java +++ b/src/test/java/com/gtnewhorizons/angelica/AngelicaExtension.java @@ -32,8 +32,9 @@ public class AngelicaExtension implements BeforeAllCallback, AfterEachCallback, if (!started) { started = true; - displayMode = findDisplayMode(800, 600, Display.getDisplayMode().getBitsPerPixel()); + displayMode = new DisplayMode(800, 600); Display.setDisplayModeAndFullscreen(displayMode); + Display.setResizable(false); Display.setFullscreen(false); final PixelFormat format = new PixelFormat().withDepthBits(24); Display.create(format); @@ -61,16 +62,6 @@ public class AngelicaExtension implements BeforeAllCallback, AfterEachCallback, Display.destroy(); } - private static DisplayMode findDisplayMode(int width, int height, int bpp) throws LWJGLException { - final DisplayMode[] modes = Display.getAvailableDisplayModes(); - for ( DisplayMode mode : modes ) { - if ( mode.getWidth() == width && mode.getHeight() == height && mode.getBitsPerPixel() >= bpp && mode.getFrequency() <= 60 ) { - return mode; - } - } - return Display.getDesktopDisplayMode(); - } - @Override public void afterEach(ExtensionContext context) throws Exception { assertEquals(GL11.GL_NO_ERROR, GL11.glGetError(), "GL Error");