chore: better bundling of binary

.gitignore

@@ -49,5 +49,3 @@ target
 
 # Do not include generated code
 src/main/java/com/codemp/intellij/jni
-src/main/resources/*.so
-src/main/resources/*.dll

build.gradle

@@ -24,6 +24,16 @@ intellij {
 	type.set("IC")
 }
 
+def cargoDir = projectDir.toPath().resolve("target").resolve("release").toFile()
+
+processResources {
+	from(cargoDir) {
+		include("*.dll")
+		include("*.so")
+		into("natives/")
+	}
+}
+
 tasks {
 	patchPluginXml {
 		sinceBuild.set("222")
@@ -44,21 +54,11 @@ tasks {
 //run cargo build
 tasks.register('cargoBuild', Exec) {
 	workingDir '.'
-	commandLine 'cargo', 'build'
+	commandLine 'cargo', 'build', '--release'
 }
 
 compileJava.dependsOn cargoBuild
 
-//copy the generated binary into the resources folder
-tasks.register('copyBinary', Copy) {
-	from "target/debug"
-	into "src/main/resources"
-	include "*.so", "*.dll"
-	dependsOn cargoBuild
-}
-
-patchPluginXml.dependsOn copyBinary
-
 //delete old jni generated files
 tasks.register('deleteGeneratedNativeInterface', Delete) {
 	delete 'src/main/java/com/codemp/intellij/jni'

src/main/java/com/codemp/intellij/CodeMP.java

@@ -21,8 +21,8 @@ public class CodeMP {
 		if(!loadedLibrary) {
 			try {
 				if(SystemInfo.isWindows) //TODO on win for some reason it bundles it twice
-					NativeUtils.loadLibraryFromJar("/codemp_intellij.dll");
+					NativeUtils.loadLibraryFromJar("/natives/codemp_intellij.dll");
-				else NativeUtils.loadLibraryFromJar("/libcodemp_intellij.so");
+				else NativeUtils.loadLibraryFromJar("/natives/libcodemp_intellij.so");
 			} catch(IOException e) {
 				throw new RuntimeException(e);
 			} finally {