From 9446eb809cbb69d9310327cff95ee438eb67a540 Mon Sep 17 00:00:00 2001 From: Demis Bellot Date: Sat, 1 Feb 2020 17:16:55 -0500 Subject: [PATCH 001/126] dep tweaks --- .../eclipse/wizard/AddReferenceWizard.java | 11 ++++++++--- .../servicestack/idea/AddServiceStackRefHandler.java | 7 ++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/ServiceStackEclipse/ServiceStackEclipse.Bundle/src/main/java/net/servicestack/eclipse/wizard/AddReferenceWizard.java b/src/ServiceStackEclipse/ServiceStackEclipse.Bundle/src/main/java/net/servicestack/eclipse/wizard/AddReferenceWizard.java index 24b8d767..1e4d60ad 100644 --- a/src/ServiceStackEclipse/ServiceStackEclipse.Bundle/src/main/java/net/servicestack/eclipse/wizard/AddReferenceWizard.java +++ b/src/ServiceStackEclipse/ServiceStackEclipse.Bundle/src/main/java/net/servicestack/eclipse/wizard/AddReferenceWizard.java @@ -40,8 +40,13 @@ public class AddReferenceWizard extends Wizard { boolean packageSelected = false; private static final String dependencyGroupId = "net.servicestack"; - private static final String dependencyVersion = "1.0.19"; + private static final String dependencyVersion = "1.0.38"; private static final String clientPackageId = "client"; + + private static final String gsonDependencyGroupId = "com.google.code.gson"; + private static final String gsonPackageId = "gson"; + private static final String gsonDependencyVersion = "2.8.6"; + boolean success = false; public AddReferenceWizard(IFolder selection, @@ -216,8 +221,8 @@ private void updatePomFile() throws Exception { IProject project = currentProject; IPath pomPath = new Path(_pomFile.getPath()); IFile file = project.getFile(pomPath); - if (mavenHelper.addMavenDependencyIfRequired(file, dependencyGroupId, - clientPackageId, dependencyVersion)) { + if (mavenHelper.addMavenDependencyIfRequired(file, dependencyGroupId, clientPackageId, dependencyVersion) || + mavenHelper.addMavenDependencyIfRequired(file, gsonDependencyGroupId, gsonPackageId , gsonDependencyVersion)) { file.refreshLocal(IResource.DEPTH_ZERO, null); openEditor(file, null); } diff --git a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddServiceStackRefHandler.java b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddServiceStackRefHandler.java index 983683d4..7d15f0ae 100644 --- a/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddServiceStackRefHandler.java +++ b/src/ServiceStackIDEA/src/main/java/net/servicestack/idea/AddServiceStackRefHandler.java @@ -24,10 +24,11 @@ public class AddServiceStackRefHandler { private static final String dependencyGroupId = "net.servicestack"; - private static final String dependencyPackageId = "android"; + private static final String androidPackageId = "android"; //Fallback version of dependencies if GitHub tags can't be checked. - private static String dependencyVersion = "1.0.15"; + private static String dependencyVersion = "1.0.38"; private static final String clientPackageId = "client"; + private static INativeTypesHandler defaultNativeTypesHandler; public static void setDependencyVersion(String version) { @@ -153,7 +154,7 @@ private static boolean tryAddMavenDependency(Module module) { private static boolean addGradleDependencyIfRequired(Module module) throws FileNotFoundException { boolean result = false; - if(GradleBuildFileHelper.addDependency(module,dependencyGroupId, dependencyPackageId, dependencyVersion)) { + if(GradleBuildFileHelper.addDependency(module,dependencyGroupId, androidPackageId, dependencyVersion)) { result = true; IDEAUtils.refreshBuildFile(module); } From 852bfd5ad5931358265ef52b3344c3dc837f7cda Mon Sep 17 00:00:00 2001 From: Demis Bellot Date: Sat, 1 Feb 2020 17:56:40 -0500 Subject: [PATCH 002/126] code clean up + centralize dep config + add gson dep as well --- .idea/ServiceStack.Java.iml | 14 +++++- src/ServiceStackIDEA/.idea/misc.xml | 5 +- src/ServiceStackIDEA/.idea/modules.xml | 4 +- src/ServiceStackIDEA/.idea/workspace.xml | 45 ++++++++--------- .../java/net/servicestack/idea/AddRef.java | 2 +- .../idea/AddServiceStackAction.java | 6 +-- .../idea/AddServiceStackRefHandler.java | 40 +++++---------- .../idea/AddTypeScriptAction.java | 6 +-- .../idea/AddTypeScriptRefHandler.java | 16 ++---- .../java/net/servicestack/idea/Analytics.java | 7 +-- .../java/net/servicestack/idea/DepConfig.java | 22 ++++++++ .../idea/DialogErrorMessages.java | 2 +- .../idea/GradleBuildFileHelper.java | 10 ++-- .../servicestack/idea/IDEAPomFileHelper.java | 50 +++++++------------ .../java/net/servicestack/idea/IDEAUtils.java | 14 +++--- 15 files changed, 116 insertions(+), 127 deletions(-) create mode 100644 src/ServiceStackIDEA/src/main/java/net/servicestack/idea/DepConfig.java diff --git a/.idea/ServiceStack.Java.iml b/.idea/ServiceStack.Java.iml index cb1905f3..c2ece305 100644 --- a/.idea/ServiceStack.Java.iml +++ b/.idea/ServiceStack.Java.iml @@ -1,11 +1,23 @@ + + + + + + - \ No newline at end of file diff --git a/src/ServiceStackIDEA/.idea/misc.xml b/src/ServiceStackIDEA/.idea/misc.xml index ed6db134..d5d79e0c 100644 --- a/src/ServiceStackIDEA/.idea/misc.xml +++ b/src/ServiceStackIDEA/.idea/misc.xml @@ -1,9 +1,6 @@ - - - - + \ No newline at end of file diff --git a/src/ServiceStackIDEA/.idea/modules.xml b/src/ServiceStackIDEA/.idea/modules.xml index 5cfb2f31..63bfe941 100644 --- a/src/ServiceStackIDEA/.idea/modules.xml +++ b/src/ServiceStackIDEA/.idea/modules.xml @@ -2,7 +2,9 @@ - + + + \ No newline at end of file diff --git a/src/ServiceStackIDEA/.idea/workspace.xml b/src/ServiceStackIDEA/.idea/workspace.xml index 76078193..67fff2e4 100644 --- a/src/ServiceStackIDEA/.idea/workspace.xml +++ b/src/ServiceStackIDEA/.idea/workspace.xml @@ -5,20 +5,21 @@ - - - - - - - - - - - + + + + - + + + + + + + + + - - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - project - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - true - - - - - - - - true - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -