Updated to latest bld snapshot.

Workaround for IDEA being confused about certain source jars when interpreting project as module.
rife2 · Aug 28, 2024 · 30fd2a4 · 30fd2a4
1 parent 3aa5b26
commit 30fd2a4
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 14 deletions.
diff --git a/.idea/libraries/compile.xml b/.idea/libraries/compile.xml
diff --git a/.idea/libraries/runtime.xml b/.idea/libraries/runtime.xml
diff --git a/.idea/libraries/test.xml b/.idea/libraries/test.xml
diff --git a/core b/core
diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar
diff --git a/src/bld/java/rife/Rife2Build.java b/src/bld/java/rife/Rife2Build.java
@@ -30,9 +30,9 @@ public Rife2Build()
         name = "RIFE2";
         version = VersionNumber.parse(FileUtils.readString(new File(srcMainResourcesDirectory(), "RIFE_VERSION")));
 
-        var imagej_version = version("1.54h");
-        var jetty_version = version(12,0,11);
-        var jsoup_version =  version(1,18,1);
+        var imagej_version = version("1.54j");
+        var jetty_version = version(12,0,12);
+        var jsoup_version = version(1,18,1);
         var tomcat_version = version(10,1,26);
 
         scope(provided)
@@ -162,6 +162,7 @@ public void download()
     throws Exception {
         super.download();
         sanitizeTomcatEmbedCore();
+        removeSourceJarsThatConfuseIntellijIDEA();
     }
 
     private void sanitizeTomcatEmbedCore()
@@ -198,6 +199,13 @@ private void sanitizeTomcatEmbedCore()
         }
     }
 
+    private void removeSourceJarsThatConfuseIntellijIDEA() {
+        for (var jar : FileUtils.getFileList(libProvidedModulesDirectory(), Pattern.compile("ij-.*-sources\\.jar|tomcat-embed-core.*-sources\\.jar"), null)) {
+            System.out.println("Removing " + libProvidedModulesDirectory() + "/" + jar + "...");
+            new File(libProvidedModulesDirectory(), jar).delete();
+        }
+    }
+
     final JarOperation jarAgentOperation = new JarOperation();
     @BuildCommand(value = "jar-agent", summary = "Creates the agent jar archive")
     public void jarAgent()