Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ target/
### IntelliJ IDEA ###
.idea/modules.xml
.idea/jarRepositories.xml
.idea/compiler.xml
.idea/libraries/
*.iws
*.iml
Expand Down
14 changes: 14 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 4 additions & 29 deletions .idea/copilotDiffState.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions TEST_GAME.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ Tras login exitoso, verás la nueva vista de partida con:

## Notas Técnicas

- **Framework**: JavaFX 12.0.1
- **Compilador**: Eclipse Compiler (ecj) para Java 8
- **Versión Java**: 8 (compilado y compatible)
- **Framework**: JavaFX 21.0.2
- **Compilador**: Maven Compiler Plugin 3.13.0 con `javac`
- **Versión Java**: 21 (LTS)
- **Patrón de Diseño**: MVC (Model-View-Controller)
- **Threading**: AnimationTimer para actualización de UI en tiempo real

Expand Down
3 changes: 2 additions & 1 deletion ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ jobs:
image: eclipse-temurin:21
steps:
- checkout
- run: java -version
- restore_cache:
key: maven-cache
paths:
- ~/.m2/repository
- run: ./mvnw -B -DskipTests=false test
- run: ./mvnw -B clean test
- save_cache:
key: maven-cache
paths:
Expand Down
13 changes: 13 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
<version>1.0-SNAPSHOT</version>

<properties>
<maven.compiler.release>21</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<javafx.maven.plugin.version>0.0.6</javafx.maven.plugin.version>
<javafx.version>21.0.2</javafx.version>
<os.detected.classifier>windows-x86_64</os.detected.classifier>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -77,6 +82,14 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<release>${maven.compiler.release}</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/es/iesquevedo/MainApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ private static void runConsoleMode() {
MainServiceImpl service = new MainServiceImpl(repository);
MainController mainController = new MainController();
mainController.setService(service);

//error, eliminar este comentario
// Adaptadores UI
UIAdapter ui = new UIAdapter(mainController);
HealthController healthController = new HealthController();
Expand Down
Loading
Loading