diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6092149..2c39952 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,12 +5,12 @@ name: Java CI with Maven on: push: - branches: [ 1.16.3 ] + branches: [ 1.16.4 ] pull_request: - branches: [ 1.16.3 ] + branches: [ 1.16.4 ] jobs: - build: + build-java-8: runs-on: ubuntu-latest @@ -22,3 +22,27 @@ jobs: java-version: 1.8 - name: Build with Maven run: mvn -B clean test package -U --file ./Auto-Tune/pom.xml + build-java-11: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Build with Maven + run: mvn -B clean test package -U --file ./Auto-Tune/pom.xml + build-java-15: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 15 + uses: actions/setup-java@v1 + with: + java-version: 15 + - name: Build with Maven + run: mvn -B clean test package -U --file ./Auto-Tune/pom.xml \ No newline at end of file diff --git a/Auto-Tune/dependency-reduced-pom.xml b/Auto-Tune/dependency-reduced-pom.xml index 55e132f..ff3fff8 100644 --- a/Auto-Tune/dependency-reduced-pom.xml +++ b/Auto-Tune/dependency-reduced-pom.xml @@ -38,6 +38,13 @@ 1.8 1.8 + + + org.projectlombok + lombok + 1.18.16 + + @@ -90,7 +97,7 @@ org.spigotmc spigot-api - 1.16.2-R0.1-SNAPSHOT + 1.16.4-R0.1-SNAPSHOT provided @@ -123,6 +130,12 @@ + + org.projectlombok + lombok + 1.18.16 + provided + org.junit.jupiter junit-jupiter-api diff --git a/Auto-Tune/pom.xml b/Auto-Tune/pom.xml index 30f99ab..e5eea7f 100644 --- a/Auto-Tune/pom.xml +++ b/Auto-Tune/pom.xml @@ -49,7 +49,7 @@ org.spigotmc spigot-api - 1.16.2-R0.1-SNAPSHOT + 1.16.4-R0.1-SNAPSHOT provided @@ -71,8 +71,8 @@ org.projectlombok lombok - 1.18.12 - compile + 1.18.16 + provided com.googlecode.json-simple @@ -117,6 +117,13 @@ 1.8 1.8 + + + org.projectlombok + lombok + 1.18.16 + + diff --git a/Auto-Tune/src/unprotesting/com/github/util/HttpPostRequestor.java b/Auto-Tune/src/unprotesting/com/github/util/HttpPostRequestor.java index e38692e..fdebd69 100644 --- a/Auto-Tune/src/unprotesting/com/github/util/HttpPostRequestor.java +++ b/Auto-Tune/src/unprotesting/com/github/util/HttpPostRequestor.java @@ -27,7 +27,7 @@ public static Double sendPostRequestUsingHttpClient(String model, String algorit Double newPrice = price; CloseableHttpClient client = HttpClients.createDefault(); HttpPost httpPost = new HttpPost("https://safe-refuge-09383.herokuapp.com"); - JSONObject json = JsonManager.returnJSONFromParams(model, algorithm, price, averageBuy, averageSell, + JSONObject json = JSONManager.returnJSONFromParams(model, algorithm, price, averageBuy, averageSell, maxVolatility, minVolatility); Main.debugLog("Sending data to API for " + item + ": - " + "model: " + model + ", price: " + price + ", averageBuy: " + averageBuy + ", averageSell: " + averageSell + ", maxVolatility: " + maxVolatility diff --git a/Auto-Tune/src/unprotesting/com/github/util/JSONManager.java b/Auto-Tune/src/unprotesting/com/github/util/JSONManager.java index 4066baa..0041a31 100644 --- a/Auto-Tune/src/unprotesting/com/github/util/JSONManager.java +++ b/Auto-Tune/src/unprotesting/com/github/util/JSONManager.java @@ -2,7 +2,7 @@ import org.json.simple.JSONObject; -public class JsonManager { +public class JSONManager { public static JSONObject returnJSONFromParams(String model, String algorithm, Double price, Double averageBuy, Double averageSell, Double maxVolatility, Double minVolatility){ JSONObject obj = new JSONObject();