From 6c254b930923f095da8a5981392da44331b6006e Mon Sep 17 00:00:00 2001 From: Sherwin Price Date: Sat, 25 Apr 2026 12:42:49 -0400 Subject: [PATCH] remove aspectj. --- .project | 11 +++++++++++ edu.tictactoe/.classpath | 3 +-- edu.tictactoe/.project | 14 ++++++++++++-- .../.settings/org.eclipse.jdt.core.prefs | 4 ++++ edu.tictactoe/build.gradle | 8 +++----- .../src/main/java/edu/tictactoe/Referee.aj | 19 ------------------- 6 files changed, 31 insertions(+), 28 deletions(-) create mode 100644 edu.tictactoe/.settings/org.eclipse.jdt.core.prefs delete mode 100644 edu.tictactoe/src/main/java/edu/tictactoe/Referee.aj diff --git a/.project b/.project index ef60f35..f73e620 100644 --- a/.project +++ b/.project @@ -14,4 +14,15 @@ org.eclipse.buildship.core.gradleprojectnature + + + 1777130461248 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/edu.tictactoe/.classpath b/edu.tictactoe/.classpath index c0cdbe5..ebff69f 100644 --- a/edu.tictactoe/.classpath +++ b/edu.tictactoe/.classpath @@ -12,8 +12,7 @@ - + - diff --git a/edu.tictactoe/.project b/edu.tictactoe/.project index 7a37124..19d0205 100644 --- a/edu.tictactoe/.project +++ b/edu.tictactoe/.project @@ -6,7 +6,7 @@ - org.eclipse.ajdt.core.ajbuilder + org.eclipse.jdt.core.javabuilder @@ -17,8 +17,18 @@ - org.eclipse.ajdt.ui.ajnature org.eclipse.jdt.core.javanature org.eclipse.buildship.core.gradleprojectnature + + + 1777130461247 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/edu.tictactoe/.settings/org.eclipse.jdt.core.prefs b/edu.tictactoe/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..f5230ee --- /dev/null +++ b/edu.tictactoe/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=26 +org.eclipse.jdt.core.compiler.compliance=26 +org.eclipse.jdt.core.compiler.source=26 diff --git a/edu.tictactoe/build.gradle b/edu.tictactoe/build.gradle index 286e384..ecced3a 100644 --- a/edu.tictactoe/build.gradle +++ b/edu.tictactoe/build.gradle @@ -4,12 +4,11 @@ plugins { // Apply the java plugin. id 'application' - id("io.freefair.aspectj") version "9.2.0" } java { toolchain { - languageVersion = JavaLanguageVersion.of(25) + languageVersion = JavaLanguageVersion.of(26) } } @@ -28,14 +27,13 @@ repositories { dependencies { implementation("org.slf4j:slf4j-api:2.0.17") implementation("ch.qos.logback:logback-classic:1.5.26") - implementation("org.aspectj:aspectjrt:1.9.25") } jar { manifest { attributes 'Automatic-Module-Name':'edu.tictactoe', 'Main-Class': 'edu.tictactoe.App', - 'Class-Path': 'edu.tictactoe org.aspectj.runtime' + 'Class-Path': 'edu.tictactoe.App' } duplicatesStrategy = DuplicatesStrategy.EXCLUDE from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } @@ -48,6 +46,6 @@ tasks.named('jar') { 'Implementation-Title': 'edu.tictactoe', 'Implementation-Version': 1.0, 'Main-Class': 'edu.tictactoe.App', - 'Class-Path': 'edu.tictactoe org.aspectj.runtime' ) + 'Class-Path': 'edu.tictactoe.App' ) } } diff --git a/edu.tictactoe/src/main/java/edu/tictactoe/Referee.aj b/edu.tictactoe/src/main/java/edu/tictactoe/Referee.aj deleted file mode 100644 index c122beb..0000000 --- a/edu.tictactoe/src/main/java/edu/tictactoe/Referee.aj +++ /dev/null @@ -1,19 +0,0 @@ -package edu.tictactoe; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public aspect Referee { // call the plays. - pointcut PlayEventUpdate(): execution(public * edu.tictactoe.Board.*(..)); - - ResultEnum around(BoardButton[] buttons): execution(public * edu.tictactoe.Board.checkGamePlay(BoardButton[])) && args(buttons) && if(buttons!=null) - { - ResultEnum oval = proceed(buttons); - - Logger logger = LoggerFactory.getLogger(Referee.class); - - logger.info(String.format("Checking Board play: %s. ", oval)); - return oval; - } - -}