diff --git a/Quidology.iml b/Quidology.iml index 8383535..aa90182 100644 --- a/Quidology.iml +++ b/Quidology.iml @@ -13,12 +13,13 @@ - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/out/artifacts/Quidology_jar/Quidology.jar b/out/artifacts/Quidology_jar/Quidology.jar new file mode 100644 index 0000000..0eb7442 Binary files /dev/null and b/out/artifacts/Quidology_jar/Quidology.jar differ diff --git a/pom.xml b/pom.xml index 9820df7..fbd5aca 100644 --- a/pom.xml +++ b/pom.xml @@ -18,35 +18,37 @@ sqlite-jdbc 3.34.0 - - com.itextpdf - itextpdf - 5.5.13 + org.openjfx + javafx-controls + 15.0.1 - org.openjfx - javafx-controls - 11.0.2 - + org.openjfx + javafx-fxml + 11.0.1 + - org.apache.maven.plugins maven-jar-plugin 3.1.0 - - true - lib/ - Main - + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + org.openjfx + javafx-maven-plugin + 0.0.5 + + HelloFX + + \ No newline at end of file diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..37197ef --- /dev/null +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: Main + diff --git a/target/Quidology-1.0-SNAPSHOT.jar b/target/Quidology-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..082be7f Binary files /dev/null and b/target/Quidology-1.0-SNAPSHOT.jar differ diff --git a/target/classes/META-INF/MANIFEST.MF b/target/classes/META-INF/MANIFEST.MF index 592d0af..37197ef 100644 --- a/target/classes/META-INF/MANIFEST.MF +++ b/target/classes/META-INF/MANIFEST.MF @@ -1,6 +1,3 @@ Manifest-Version: 1.0 Main-Class: Main -Class-Path: src.zip javafx-swt.jar javafx.web.jar javafx.base.jar javafx - .fxml.jar javafx.media.jar javafx.swing.jar javafx.controls.jar javafx. - graphics.jar itextpdf-5.5.13.jar sqlite-jdbc-3.34.0.jar diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 0000000..40926c5 --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,4 @@ +#Created by Apache Maven 3.6.3 +groupId=groupId +artifactId=Quidology +version=1.0-SNAPSHOT diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 4214433..5649be9 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,3 +1,7 @@ -/Users/sophie/IdeaProjects/Quidology/src/main/java/AuthController.java +/Users/sophie/IdeaProjects/Quidology/src/main/java/Dashboard/DashboardController.java +/Users/sophie/IdeaProjects/Quidology/src/main/java/Login/AuthController.java +/Users/sophie/IdeaProjects/Quidology/src/main/java/Database/Database.java +/Users/sophie/IdeaProjects/Quidology/src/main/java/TakeQuiz/QuizController.java +/Users/sophie/IdeaProjects/Quidology/src/main/java/BCrypt/BCrypt.java /Users/sophie/IdeaProjects/Quidology/src/main/java/Main.java -/Users/sophie/IdeaProjects/Quidology/src/main/java/Quidology/BCrypt.java +/Users/sophie/IdeaProjects/Quidology/src/main/java/TakeQuiz/ReportController.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..e69de29