Skip to content
Snippets Groups Projects
Commit 25e4881d authored by COUETOUX Basile's avatar COUETOUX Basile
Browse files

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
parents cb3f656a 6381aa29
No related branches found
No related tags found
No related merge requests found
plugins {
id 'java'
}
plugins { plugins {
id 'application' id 'application'
id "org.openjfx.javafxplugin" version "0.0.8" id "org.openjfx.javafxplugin" version "0.0.10"
} }
javafx { javafx {
version = "11" version = "17"
modules = [ 'javafx.controls', 'javafx.fxml' ] modules = [ 'javafx.controls', 'javafx.fxml' ]
} }
version '1.0-SNAPSHOT'
repositories { repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
testImplementation group: 'junit', name: 'junit', version: '4.12'
testImplementation 'org.hamcrest:hamcrest-library:1.3'
} }
mainClassName = "serializer.App" mainClassName = "shape.App"
test { test {
......
...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME ...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment