From 608c66766b3f354a5a8ea670a5b319b6dfc63e0a Mon Sep 17 00:00:00 2001 From: James Munson Date: Thu, 4 Jul 2019 23:07:02 -0700 Subject: [PATCH 1/9] Incremental Builds --- pom.xml | 34 +++++++++++++++++++ .../resources/archetype-resources/pom.xml | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a3fe52405..820b29c1fa 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,7 @@ 3.0.0-M1 2.5.3 2.18 + 1.13.9 true true @@ -236,6 +237,11 @@ + + io.takari.maven.plugins + takari-lifecycle-plugin + ${maven.takari-lifecycle-plugin.verson} + org.apache.maven.plugins maven-compiler-plugin @@ -243,6 +249,9 @@ ${java.version} ${java.version} + + true + true @@ -328,10 +337,35 @@ maven-jar-plugin ${maven.jar.plugin.version} + + io.takari.maven.plugins + takari-lifecycle-plugin + ${maven.takari-lifecycle-plugin.verson} + + + compile + + compile + + compile + + 8 + proc + + javac + + + + org.apache.maven.plugins maven-compiler-plugin ${maven.compiler.plugin.version} + + + true + true + diff --git a/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml b/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml index 11882b973e..101f936b5c 100644 --- a/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml +++ b/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml @@ -5,7 +5,7 @@ \${groupId} \${artifactId} \${version} - jar + takari-jar UTF-8 From 9d8c96f612d90cd5c7f2a0ee09a0c5f4572f060f Mon Sep 17 00:00:00 2001 From: James Munson Date: Fri, 5 Jul 2019 12:39:07 -0700 Subject: [PATCH 2/9] Incremental Builds --- http-api/pom.xml | 35 +++++++++++++++++++++++++++++++++++ pom.xml | 4 ++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/http-api/pom.xml b/http-api/pom.xml index ccd886a376..8941ca7970 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -40,6 +40,7 @@ 2.2.6 nogit + 1.7 false @@ -114,5 +115,39 @@ + + + + io.takari.maven.plugins + takari-lifecycle-plugin + ${maven.takari-lifecycle-plugin.verson} + + + compile + + compile + + compile + + 8 + proc + + jdt + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin.version} + + + true + true + + + + diff --git a/pom.xml b/pom.xml index 820b29c1fa..6ecea38310 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ UTF-8 1.8 - 1.18.4 + 1.18.8 8.3 1.2.3 2.8.5 @@ -352,7 +352,7 @@ 8 proc - javac + jdt From 1ec45e09d43be9f4f1ad3f51a637274551644e7a Mon Sep 17 00:00:00 2001 From: James Munson Date: Fri, 5 Jul 2019 15:19:04 -0700 Subject: [PATCH 3/9] Incremental Builds --- .../java/net/runelite/http/api/examine/ExamineClient.java | 2 +- .../java/net/runelite/http/api/ws/WebsocketGsonFactory.java | 6 +++--- .../src/main/java/net/runelite/http/api/xp/XpClient.java | 2 +- pom.xml | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java b/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java index 5997799c2e..9f25c847b9 100644 --- a/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java +++ b/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java @@ -84,7 +84,7 @@ public class ExamineClient public void onResponse(Call call, Response response) { response.close(); - logger.debug("Submitted examine info for {} {}: {}", type, id, text); + //logger.debug("Submitted examine info for {} {}: {}", type, id, text); } }); } diff --git a/http-api/src/main/java/net/runelite/http/api/ws/WebsocketGsonFactory.java b/http-api/src/main/java/net/runelite/http/api/ws/WebsocketGsonFactory.java index 589a538de3..bd6771e00c 100644 --- a/http-api/src/main/java/net/runelite/http/api/ws/WebsocketGsonFactory.java +++ b/http-api/src/main/java/net/runelite/http/api/ws/WebsocketGsonFactory.java @@ -28,7 +28,6 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; import net.runelite.http.api.ws.messages.Handshake; import net.runelite.http.api.ws.messages.LoginResponse; @@ -79,8 +78,9 @@ public class WebsocketGsonFactory .create(); } - public static Gson build() + public static boolean build() { - return build(factory(Collections.emptyList())); + //return build(factory(Collections.emptyList())); + return true; } } diff --git a/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java b/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java index c45fe2e209..81c94b747e 100644 --- a/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java +++ b/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java @@ -62,7 +62,7 @@ public class XpClient public void onResponse(Call call, Response response) { response.close(); - logger.debug("Submitted xp track for {}", username); + //logger.debug("Submitted xp track for {}", username); } }); } diff --git a/pom.xml b/pom.xml index 6ecea38310..27b8245644 100644 --- a/pom.xml +++ b/pom.xml @@ -349,7 +349,8 @@ compile - 8 + ${java.version} + ${java.version} proc jdt From 6ce193342bb94afc67704dec762c80d8c2255ad8 Mon Sep 17 00:00:00 2001 From: James Munson Date: Fri, 5 Jul 2019 15:19:37 -0700 Subject: [PATCH 4/9] Revert "Incremental Builds" This reverts commit 9d8c96f6 --- http-api/pom.xml | 35 ----------------------------------- pom.xml | 4 ++-- 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/http-api/pom.xml b/http-api/pom.xml index 8941ca7970..ccd886a376 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -40,7 +40,6 @@ 2.2.6 nogit - 1.7 false @@ -115,39 +114,5 @@ - - - - io.takari.maven.plugins - takari-lifecycle-plugin - ${maven.takari-lifecycle-plugin.verson} - - - compile - - compile - - compile - - 8 - proc - - jdt - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin.version} - - - true - true - - - - diff --git a/pom.xml b/pom.xml index 27b8245644..057d2088d2 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ UTF-8 1.8 - 1.18.8 + 1.18.4 8.3 1.2.3 2.8.5 @@ -353,7 +353,7 @@ ${java.version} proc - jdt + javac From 7412a29a54448b1daf7da8f9f4e7aee5005591b3 Mon Sep 17 00:00:00 2001 From: James Munson Date: Fri, 5 Jul 2019 15:20:30 -0700 Subject: [PATCH 5/9] Revert "Incremental Builds" This reverts commit 9d8c96f6 --- pom.xml | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/pom.xml b/pom.xml index 057d2088d2..6a3fe52405 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,6 @@ 3.0.0-M1 2.5.3 2.18 - 1.13.9 true true @@ -237,11 +236,6 @@ - - io.takari.maven.plugins - takari-lifecycle-plugin - ${maven.takari-lifecycle-plugin.verson} - org.apache.maven.plugins maven-compiler-plugin @@ -249,9 +243,6 @@ ${java.version} ${java.version} - - true - true @@ -337,36 +328,10 @@ maven-jar-plugin ${maven.jar.plugin.version} - - io.takari.maven.plugins - takari-lifecycle-plugin - ${maven.takari-lifecycle-plugin.verson} - - - compile - - compile - - compile - - ${java.version} - ${java.version} - proc - - javac - - - - org.apache.maven.plugins maven-compiler-plugin ${maven.compiler.plugin.version} - - - true - true - From 8688a87a94ab2e441d4cec4899aa6134d7f769d4 Mon Sep 17 00:00:00 2001 From: James Munson Date: Fri, 5 Jul 2019 15:21:07 -0700 Subject: [PATCH 6/9] "Incremental Builds" --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 6a3fe52405..912efca8b3 100644 --- a/pom.xml +++ b/pom.xml @@ -243,6 +243,10 @@ ${java.version} ${java.version} + + false From 1ac52afd4c9ca2dba4c0e8fb8cad1b3c0afaa31c Mon Sep 17 00:00:00 2001 From: James Munson Date: Fri, 5 Jul 2019 15:36:27 -0700 Subject: [PATCH 7/9] "Incremental Builds" --- .../java/net/runelite/http/api/examine/ExamineClient.java | 2 +- .../java/net/runelite/http/api/ws/WebsocketGsonFactory.java | 6 +++--- .../src/main/java/net/runelite/http/api/xp/XpClient.java | 2 +- pom.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java b/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java index 9f25c847b9..5997799c2e 100644 --- a/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java +++ b/http-api/src/main/java/net/runelite/http/api/examine/ExamineClient.java @@ -84,7 +84,7 @@ public class ExamineClient public void onResponse(Call call, Response response) { response.close(); - //logger.debug("Submitted examine info for {} {}: {}", type, id, text); + logger.debug("Submitted examine info for {} {}: {}", type, id, text); } }); } diff --git a/http-api/src/main/java/net/runelite/http/api/ws/WebsocketGsonFactory.java b/http-api/src/main/java/net/runelite/http/api/ws/WebsocketGsonFactory.java index bd6771e00c..589a538de3 100644 --- a/http-api/src/main/java/net/runelite/http/api/ws/WebsocketGsonFactory.java +++ b/http-api/src/main/java/net/runelite/http/api/ws/WebsocketGsonFactory.java @@ -28,6 +28,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import net.runelite.http.api.ws.messages.Handshake; import net.runelite.http.api.ws.messages.LoginResponse; @@ -78,9 +79,8 @@ public class WebsocketGsonFactory .create(); } - public static boolean build() + public static Gson build() { - //return build(factory(Collections.emptyList())); - return true; + return build(factory(Collections.emptyList())); } } diff --git a/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java b/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java index 81c94b747e..c45fe2e209 100644 --- a/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java +++ b/http-api/src/main/java/net/runelite/http/api/xp/XpClient.java @@ -62,7 +62,7 @@ public class XpClient public void onResponse(Call call, Response response) { response.close(); - //logger.debug("Submitted xp track for {}", username); + logger.debug("Submitted xp track for {}", username); } }); } diff --git a/pom.xml b/pom.xml index 912efca8b3..83026664b7 100644 --- a/pom.xml +++ b/pom.xml @@ -312,7 +312,7 @@ io.github.zlika - reproducible-build-maven-plugin + reproducible-build-maven-plugin//logger.debug("Submitted xp track for {}", username); ${zlika.reproducible.build.maven.plugin.version} From 842b6a7495df8a130ee7e4f010914b9178b3bdb0 Mon Sep 17 00:00:00 2001 From: James Munson Date: Fri, 5 Jul 2019 15:37:21 -0700 Subject: [PATCH 8/9] "Incremental Builds" --- pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 83026664b7..912efca8b3 100644 --- a/pom.xml +++ b/pom.xml @@ -312,7 +312,7 @@ io.github.zlika - reproducible-build-maven-plugin//logger.debug("Submitted xp track for {}", username); + reproducible-build-maven-plugin ${zlika.reproducible.build.maven.plugin.version} diff --git a/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml b/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml index 101f936b5c..11882b973e 100644 --- a/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml +++ b/runelite-plugin-archetype/src/main/resources/archetype-resources/pom.xml @@ -5,7 +5,7 @@ \${groupId} \${artifactId} \${version} - takari-jar + jar UTF-8 From 189838dfd156afe11a423750f6887b707983e433 Mon Sep 17 00:00:00 2001 From: James Munson Date: Fri, 5 Jul 2019 15:55:46 -0700 Subject: [PATCH 9/9] Update maven-compiler-plugin and allow incremental compilation --- pom.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 912efca8b3..1a6725a618 100644 --- a/pom.xml +++ b/pom.xml @@ -37,6 +37,7 @@ UTF-8 + false 1.8 1.18.4 8.3 @@ -53,7 +54,7 @@ 0.7 3.0.2 - 3.6.1 + 3.8.1 2.17 3.0.0-M1 2.5.3 @@ -243,10 +244,6 @@ ${java.version} ${java.version} - - false