diff --git a/graphminimize/build.gradle b/graphminimize/build.gradle index d0d89631569f55e252f758c08b12b133fca5f88d..7b80aed76291c63367b4130fd27ad81bf96a9b28 100644 --- a/graphminimize/build.gradle +++ b/graphminimize/build.gradle @@ -31,6 +31,8 @@ dependencies { compileOnly name: 'commons-math3-3.6.1' compileOnly name: 'jfreechart-1.6.0' implementation name: 'batik-all-1.14' + implementation name: 'json-java' + } jar { diff --git a/graphshow/build.gradle b/graphshow/build.gradle index ffa1c591f4b5d684b4d7e5aca811bb00848e51d5..d784aed8571f9a8a8db3c1e3df216aa32e0f011c 100644 --- a/graphshow/build.gradle +++ b/graphshow/build.gradle @@ -26,6 +26,7 @@ dependencies { implementation name: 'commons-math3-3.6.1' implementation name: 'jfreechart-1.6.0' implementation name: 'batik-all-1.14' + implementation name: 'json-java' } jar { diff --git a/launcher/build.gradle b/launcher/build.gradle index 8c97d9b81426c8b92b4f97795208d09c2cc254dc..1c07d24e9fd6692611802b5dce1a71027bde42ab 100644 --- a/launcher/build.gradle +++ b/launcher/build.gradle @@ -18,6 +18,7 @@ dependencies { compileOnly name: 'jna-3.3.0' implementation name: 'commons-math3-3.6.1' implementation name: 'jfreechart-1.6.0' + implementation name: 'json-java' } jar { diff --git a/src/main/java/myutil/AIInterface.java b/src/main/java/myutil/AIInterface.java index fbb830992cf27f65a190ee9689efd83fab500b97..3ec2a09ebf63267d868d50b3cf9532c93e240d43 100644 --- a/src/main/java/myutil/AIInterface.java +++ b/src/main/java/myutil/AIInterface.java @@ -107,10 +107,10 @@ public class AIInterface { public StringBuilder chat(String text) throws AIInterfaceException { connect(); - JSONObject mainObject = new JSONObject(); + org.json.JSONObject mainObject = new org.json.JSONObject(); mainObject.put("model", "gpt-3.5-turbo"); - JSONArray array = new JSONArray(); - JSONObject sub = new JSONObject(); + org.json.JSONArray array = new org.json.JSONArray(); + org.json.JSONObject sub = new org.json.JSONObject(); sub.put("role", "system"); sub.put("content", "You are a helpful assistant."); sub = new JSONObject(); @@ -122,7 +122,7 @@ public class AIInterface { return getAnswer(); } - private void sendJSON(JSONObject _jsonToBeSent) throws AIInterfaceException { + private void sendJSON(org.json.JSONObject _jsonToBeSent) throws AIInterfaceException { if (connection == null) { throw new AIInterfaceException(CONNECTION_PB); } diff --git a/ttool/build.gradle b/ttool/build.gradle index c07cd91fb4d53260257c6518a370a7dd5ea7288c..4065ae363f7b075131cf495e47028f6b7071a375 100644 --- a/ttool/build.gradle +++ b/ttool/build.gradle @@ -13,7 +13,8 @@ sourceSets { test { java { - srcDir "${rootProject.absPath}/tests/util/fr.tpt.ttool.tests.util/src" + //srcDir "${rootProject.absPath}/tests/util/fr.tpt.ttool.tests.util/src" + srcDir "${rootProject.absPath}/src/test/java" } } } @@ -38,7 +39,7 @@ dependencies { implementation name: 'commons-logging-1.0.4' implementation name: 'xmlgraphics-commons-2.6' implementation name: 'batik-all-1.14' - implementation name: 'xml-apis' + implementation name: 'xml-apis' implementation name: 'json-java' implementation name: 'fop'