Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties

build.gradle

-plugins {
-    id 'java'
-}
+
+
 
 plugins {
     id 'application'
-    id "org.openjfx.javafxplugin" version "0.0.8"
+    id "org.openjfx.javafxplugin" version "0.0.10"
 }
 
 javafx {
-    version = "11"
+    version = "17"
     modules = [ 'javafx.controls', 'javafx.fxml' ]
 }
 
 
-version '1.0-SNAPSHOT'
-
-
-
 repositories {
     mavenCentral()
 }
-
 dependencies {
-
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
+    testImplementation 'org.hamcrest:hamcrest-library:1.3'
 }
 
-mainClassName = "serializer.App"
+mainClassName = "shape.App"
 
 
 test {

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 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