Updated

sophiezhng · Feb 13, 2021 · a4b2771 · a4b2771
1 parent 06f2f57
commit a4b2771
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 26 deletions.
diff --git a/Quidology.iml b/Quidology.iml
@@ -13,12 +13,13 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="lib" level="project" />
     <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.34.0" level="project" />
-    <orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.13" level="project" />
-    <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:11.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:mac:11.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:11.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:mac:11.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.openjfx:javafx-base:11.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.openjfx:javafx-base:mac:11.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:15.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:mac:15.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:15.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:mac:15.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx-base:15.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx-base:mac:15.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx-fxml:11.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.openjfx:javafx-fxml:mac:11.0.1" level="project" />
   </component>
 </module>
diff --git a/out/artifacts/Quidology_jar/Quidology.jar b/out/artifacts/Quidology_jar/Quidology.jar
diff --git a/pom.xml b/pom.xml
@@ -18,35 +18,37 @@
             <artifactId>sqlite-jdbc</artifactId>
             <version>3.34.0</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.itextpdf/itextpdf -->
         <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itextpdf</artifactId>
-            <version>5.5.13</version>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-controls</artifactId>
+            <version>15.0.1</version>
         </dependency>
         <dependency>
-		   <groupId>org.openjfx</groupId>
-		   <artifactId>javafx-controls</artifactId>
-		   <version>11.0.2</version>
-		</dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-fxml</artifactId>
+            <version>11.0.1</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
             <plugin>
-                <!-- Build an executable JAR -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.1.0</version>
                 <configuration>
                     <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>lib/</classpathPrefix>
-                            <mainClass>Main</mainClass>
-                        </manifest>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                     </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.openjfx</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>0.0.5</version>
+                <configuration>
+                    <mainClass>HelloFX</mainClass>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/src/main/resources/META-INF/MANIFEST.MF 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
diff --git 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
@@ -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
@@ -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