From cff9ca6463e6570702288dffa3bd8248cd04afa9 Mon Sep 17 00:00:00 2001 From: Sherwin Price Date: Fri, 6 Feb 2026 13:14:36 -0500 Subject: [PATCH] add aspectj --- edu.tictactoe/build.gradle | 39 +++++++++++ .../src/main/java/edu/tictactoe/App.java | 0 .../src/main/java/edu/tictactoe/Board.java | 0 .../main/java/edu/tictactoe/BoardButton.java | 0 .../main/java/edu/tictactoe/BoardFrame.java | 0 .../edu/tictactoe/ResourceImageLoader.java | 0 .../src/main/resources/blank.png | Bin .../src/main/resources/naught.png | Bin .../src/main/resources/x.png | Bin gradle/libs.versions.toml | 4 -- lib/build.gradle | 62 ------------------ settings.gradle | 2 +- 12 files changed, 40 insertions(+), 67 deletions(-) create mode 100644 edu.tictactoe/build.gradle rename {lib => edu.tictactoe}/src/main/java/edu/tictactoe/App.java (100%) rename {lib => edu.tictactoe}/src/main/java/edu/tictactoe/Board.java (100%) rename {lib => edu.tictactoe}/src/main/java/edu/tictactoe/BoardButton.java (100%) rename {lib => edu.tictactoe}/src/main/java/edu/tictactoe/BoardFrame.java (100%) rename {lib => edu.tictactoe}/src/main/java/edu/tictactoe/ResourceImageLoader.java (100%) rename {lib => edu.tictactoe}/src/main/resources/blank.png (100%) rename {lib => edu.tictactoe}/src/main/resources/naught.png (100%) rename {lib => edu.tictactoe}/src/main/resources/x.png (100%) delete mode 100644 lib/build.gradle diff --git a/edu.tictactoe/build.gradle b/edu.tictactoe/build.gradle new file mode 100644 index 0000000..537754d --- /dev/null +++ b/edu.tictactoe/build.gradle @@ -0,0 +1,39 @@ +/* +*/ + +plugins { + // Apply the java plugin. + id 'java' +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(25) + } +} + +group = 'edu.tictactoe' +version = '1.0' + +repositories { + // Use Maven Central for resolving dependencies. + mavenCentral() +} + +dependencies { + implementation("org.aspectj:aspectjrt:1.9.25") +} + +jar { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } +} + +tasks.named('jar') { + manifest { + attributes('Implementation-Title': 'edu.tictactoe', + 'Implementation-Version': 1.0, + 'Main-Class': 'edu.tictactoe.App', + 'Class-Path': 'edu.tictactoe org.aspectj.runtime' ) + } +} diff --git a/lib/src/main/java/edu/tictactoe/App.java b/edu.tictactoe/src/main/java/edu/tictactoe/App.java similarity index 100% rename from lib/src/main/java/edu/tictactoe/App.java rename to edu.tictactoe/src/main/java/edu/tictactoe/App.java diff --git a/lib/src/main/java/edu/tictactoe/Board.java b/edu.tictactoe/src/main/java/edu/tictactoe/Board.java similarity index 100% rename from lib/src/main/java/edu/tictactoe/Board.java rename to edu.tictactoe/src/main/java/edu/tictactoe/Board.java diff --git a/lib/src/main/java/edu/tictactoe/BoardButton.java b/edu.tictactoe/src/main/java/edu/tictactoe/BoardButton.java similarity index 100% rename from lib/src/main/java/edu/tictactoe/BoardButton.java rename to edu.tictactoe/src/main/java/edu/tictactoe/BoardButton.java diff --git a/lib/src/main/java/edu/tictactoe/BoardFrame.java b/edu.tictactoe/src/main/java/edu/tictactoe/BoardFrame.java similarity index 100% rename from lib/src/main/java/edu/tictactoe/BoardFrame.java rename to edu.tictactoe/src/main/java/edu/tictactoe/BoardFrame.java diff --git a/lib/src/main/java/edu/tictactoe/ResourceImageLoader.java b/edu.tictactoe/src/main/java/edu/tictactoe/ResourceImageLoader.java similarity index 100% rename from lib/src/main/java/edu/tictactoe/ResourceImageLoader.java rename to edu.tictactoe/src/main/java/edu/tictactoe/ResourceImageLoader.java diff --git a/lib/src/main/resources/blank.png b/edu.tictactoe/src/main/resources/blank.png similarity index 100% rename from lib/src/main/resources/blank.png rename to edu.tictactoe/src/main/resources/blank.png diff --git a/lib/src/main/resources/naught.png b/edu.tictactoe/src/main/resources/naught.png similarity index 100% rename from lib/src/main/resources/naught.png rename to edu.tictactoe/src/main/resources/naught.png diff --git a/lib/src/main/resources/x.png b/edu.tictactoe/src/main/resources/x.png similarity index 100% rename from lib/src/main/resources/x.png rename to edu.tictactoe/src/main/resources/x.png diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 651114c..bccd9e1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,9 +2,5 @@ # https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format [versions] -commons-math3 = "3.6.1" -guava = "33.4.6-jre" [libraries] -commons-math3 = { module = "org.apache.commons:commons-math3", version.ref = "commons-math3" } -guava = { module = "com.google.guava:guava", version.ref = "guava" } diff --git a/lib/build.gradle b/lib/build.gradle deleted file mode 100644 index 59bee89..0000000 --- a/lib/build.gradle +++ /dev/null @@ -1,62 +0,0 @@ -/* -*/ - -plugins { - // Apply the java-library plugin for API and implementation separation. - id 'java' - id("io.freefair.aspectj") version "9.2.0" // Check the latest version on the plugin website - id 'application' - id("org.owasp.dependencycheck") version "12.2.0" - - -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(25) - } -} - -group = 'edu.tictactoe' -version = '1.0' - -application { - mainClass = 'edu.tictactoe.App' -} - -sourceSets { - main { - java { - srcDirs = ['src/main/java'] - } - resources { - srcDirs = ['src/main/resources'] - } - } -} - -repositories { - // Use Maven Central for resolving dependencies. - mavenCentral() -} - -dependencies { - implementation("org.aspectj:aspectjrt:1.9.25") -} - -jar { - manifest { - attributes 'Main-Class': application.mainClass - } - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } -} - -tasks.named('jar') { - manifest { - attributes('Implementation-Title': application.mainClass, - 'Implementation-Version': 1.0, - 'Main-Class': application.mainClass, - 'Class-Path': 'edu.tictactoe .' ) - } -} diff --git a/settings.gradle b/settings.gradle index 049cfff..cf2b29c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,4 +12,4 @@ plugins { } rootProject.name = 'tictactoe' -include('lib') +include('edu.tictactoe')