From b4f3f557e9ca985f5f2d113720499ab3b534ef1f Mon Sep 17 00:00:00 2001
From: arnaudlabourel <arnaud.labourel@univ-amu.fr>
Date: Wed, 18 Oct 2023 16:16:46 +0200
Subject: [PATCH] updated gradle config
---
.gitignore | 46 ++----------------------
build.gradle | 20 +++++++----
gradle/wrapper/gradle-wrapper.properties | 2 +-
settings.gradle | 2 +-
4 files changed, 17 insertions(+), 53 deletions(-)
diff --git a/.gitignore b/.gitignore
index 033f6e1..1ca2791 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,50 +1,8 @@
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# AWS User-specific
-.idea/**/aws.xml
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn. Uncomment if using
-# auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
+# Idea
+.idea/
# File-based project format
*.iws
diff --git a/build.gradle b/build.gradle
index 10ee756..8ab23f1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,11 @@
plugins {
id 'application'
- id "org.openjfx.javafxplugin" version "0.0.10"
+ id "org.openjfx.javafxplugin" version "0.0.14"
}
javafx {
- version = "17"
+ version = "20"
modules = [ 'javafx.controls', 'javafx.fxml' ]
}
@@ -13,14 +13,20 @@ javafx {
repositories {
mavenCentral()
}
+
dependencies {
- testImplementation group: 'junit', name: 'junit', version: '4.12'
- testImplementation 'org.hamcrest:hamcrest-library:1.3'
+ testRuntimeOnly("org.junit.platform:junit-platform-launcher") {
+ because("Only needed to run tests in a version of IntelliJ IDEA that bundles older versions")
+ }
+ testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+ testImplementation("org.assertj:assertj-core:3.24.2")
+ testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
}
-mainClassName = "App"
-
-
test {
useJUnitPlatform()
}
+
+application {
+ mainClass.set("App")
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 41dfb87..e411586 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index 634fa3e..b9eacbe 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
-rootProject.name = 'ff'
+rootProject.name = 'firefighter'
--
GitLab