From 785ad690f6f82a606f69004c0099e59950965d40 Mon Sep 17 00:00:00 2001 From: Alex Cook Date: Fri, 5 Sep 2025 16:20:28 -0400 Subject: [PATCH 1/3] build: add proper spotless support to subprojects --- build.gradle | 9 ++++++++- framework/build.gradle | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d8bb679..9c738bd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'net.ltgt.errorprone' version '4.3.0' apply false - id 'com.diffplug.spotless' version '7.2.1' apply false + id 'com.diffplug.spotless' version '7.2.1' apply true } subprojects { @@ -8,11 +8,18 @@ subprojects { mavenCentral() } + apply plugin: 'com.diffplug.spotless' plugins.withId('java') { java { toolchain { languageVersion = JavaLanguageVersion.of(25) } } + + spotless { + java { + googleJavaFormat('1.22.0') + } + } } } diff --git a/framework/build.gradle b/framework/build.gradle index 6a2735e..9183049 100644 --- a/framework/build.gradle +++ b/framework/build.gradle @@ -1,7 +1,6 @@ plugins { id 'java' id 'net.ltgt.errorprone' - id 'com.diffplug.spotless' } dependencies { From cf41dcefae9f0db6294435afb4d8ec0ba7629e3c Mon Sep 17 00:00:00 2001 From: Alex Cook Date: Fri, 5 Sep 2025 16:58:50 -0400 Subject: [PATCH 2/3] build: add eclipse support --- build.gradle | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 9c738bd..c01e04c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,14 @@ plugins { id 'net.ltgt.errorprone' version '4.3.0' apply false - id 'com.diffplug.spotless' version '7.2.1' apply true + id 'com.diffplug.spotless' version '7.2.1' apply false + id 'java' } subprojects { repositories { mavenCentral() } - + // TODO: better spotless integration to support groovy etc... apply plugin: 'com.diffplug.spotless' plugins.withId('java') { java { @@ -23,3 +24,20 @@ subprojects { } } } + +allprojects { + apply plugin: 'eclipse' + eclipse.classpath { + defaultOutputDir = file("build/default") + file.whenMerged { cp -> + cp.entries.forEach { cpe -> + if (cpe instanceof org.gradle.plugins.ide.eclipse.model.SourceFolder) { + cpe.output = cpe.output.replace "bin/", "build/classes/java/" + } + if (cpe instanceof org.gradle.plugins.ide.eclipse.model.Output) { + cpe.path = cpe.path.replace "bin/", "build/" + } + } + } + } +} From b72ca82892806afa0117a0a35acd313ab9ae4760 Mon Sep 17 00:00:00 2001 From: Alex Cook Date: Sun, 7 Sep 2025 11:24:53 -0400 Subject: [PATCH 3/3] chore(spotless): apply spotless --- .../github/eisop/runtimeframework/agent/RuntimeAgent.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/framework/src/main/java/io/github/eisop/runtimeframework/agent/RuntimeAgent.java b/framework/src/main/java/io/github/eisop/runtimeframework/agent/RuntimeAgent.java index c5319bc..7d1acad 100644 --- a/framework/src/main/java/io/github/eisop/runtimeframework/agent/RuntimeAgent.java +++ b/framework/src/main/java/io/github/eisop/runtimeframework/agent/RuntimeAgent.java @@ -1,9 +1,7 @@ package io.github.eisop.runtimeframework.agent; -import java.lang.instrument.Instrumentation; - public class RuntimeAgent { - public static void premain(String args, java.lang.instrument.Instrumentation inst) { - System.out.println("Agent Initialized"); - } + public static void premain(String args, java.lang.instrument.Instrumentation inst) { + System.out.println("Agent Initialized"); + } }