Merge pull request #10 from faiqsohail/move-project-to-maven

Create project object model

.gitignore

@@ -0,0 +1,19 @@
+.DS_Store
+
+# Intellij
+.idea/
+*.iml
+*.iws
+
+# Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+# https://github.com/takari/maven-wrapper#usage-without-binary-jar
+.mvn/wrapper/maven-wrapper.jar

CONTRIBUTING.md

@@ -5,13 +5,13 @@ As ProxyChecker is an open-source project your contribution helps the project th
 
 ### Reporting Bugs
 
-When reporting a Bug please be sure to follow the [Bug Report Template](https://github.com/HiddenMotives/ProxyChecker/issues/new?assignees=&labels=&template=bug_report.md&title=) 
+When reporting a Bug please be sure to follow the [Bug Report Template](https://github.com/faiqsohail/ProxyChecker/issues/new?assignees=&labels=&template=bug_report.md&title=) 
 and provide as much detail as possible.
 
 
 ### Suggesting Enhancements
 
-To suggest a feature or enhancement use the [Feature Request Template](https://github.com/HiddenMotives/ProxyChecker/issues/new?assignees=&labels=&template=feature_request.md&title=),
+To suggest a feature or enhancement use the [Feature Request Template](https://github.com/faiqsohail/ProxyChecker/issues/new?assignees=&labels=&template=feature_request.md&title=),
 be sure your request is inline with the scope of the project.
 
 ### Writing Code

README.md

@@ -21,22 +21,19 @@ Allows you to quickly check HTTP and SOCKS proxies in a user friendly GUI, for W
 * Java 1.8+
 * Internet Connection :)
 
-### Dependencies
-* Gson 2.8.5 (included in packaged release)
 
 ### Installation & Usage
 Simply download the latest packaged release for your system and run!
-* [Latest Release](https://github.com/HiddenMotives/ProxyChecker/releases/latest)
+* [Latest Release](https://github.com/faiqsohail/ProxyChecker/releases/latest)
 * Windows (.exe), Mac OS (.dmg), Other (.jar)
 
 
 ### Build from Source
-You may also build and run ProxyChecker directly with the included makefile.
-This assumes you have Java setup correctly with JavaFX accessible by your JDK.
+This assumes you have both Java and [Maven](https://maven.apache.org/download.cgi) setup correctly.
 ```
-git clone https://github.com/HiddenMotives/ProxyChecker.git
-make -C ProxyChecker/
-java -jar ProxyChecker/artifact/ProxyChecker.jar
+git clone https://github.com/faiqsohail/ProxyChecker.git
+mvn package -f ProxyChecker/pom.xml
+java -jar ProxyChecker/target/ProxyChecker.jar
 ```
 
 

pom.xml

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>co.proxychecker.ProxyChecker</groupId>
+    <artifactId>ProxyChecker</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <javafx.version>17</javafx.version>
+        <javafx.maven.plugin.version>0.0.8</javafx.maven.plugin.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-controls</artifactId>
+            <version>${javafx.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-fxml</artifactId>
+            <version>${javafx.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.5</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <filtering>false</filtering>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.fxml</include>
+                    <include>**/*.png</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.openjfx</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>${javafx.maven.plugin.version}</version>
+                <configuration>
+                    <mainClass>co.proxychecker.ProxyChecker.startup.Launcher</mainClass>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.0.2</version>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>co.proxychecker.ProxyChecker.startup.Launcher</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <finalName>ProxyChecker</finalName>
+                    <appendAssemblyId>false</appendAssemblyId>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

src/co/proxychecker/ProxyChecker/components/Settings.java → src/main/java/co/proxychecker/ProxyChecker/components/Settings.java

@@ -11,10 +11,10 @@
  */
 public class Settings {
 
-    private static final String APPLICATION_VERSION = "1.1";
+    private static final String APPLICATION_VERSION = "1.2";
     private static final String APPLICATION_NAME = "Proxy Checker";
     private static final String APPLICATION_URL = "https://proxychecker.co";
-    private static final String APPLICATION_REPO = "https://github.com/HiddenMotives/ProxyChecker/";
+    private static final String APPLICATION_REPO = "https://github.com/faiqsohail/ProxyChecker/";
 
     public static String getApplicationName() {
         return APPLICATION_NAME;

src/main/java/co/proxychecker/ProxyChecker/startup/Launcher.java

@@ -0,0 +1,7 @@
+package co.proxychecker.ProxyChecker.startup;
+
+public class Launcher {
+    public static void main(String[] args) {
+        ProxyChecker.main(args);
+    }
+}