diff --git a/build.gradle b/build.gradle
index 811de2a57f..8ce174a610 100644
--- a/build.gradle
+++ b/build.gradle
@@ -144,7 +144,13 @@ def ntcoreZipTask = { project ->
 
     project.build.dependsOn project.ntcoreZip
 
-    project.releaseSetup(project.ntcoreZip)
+    def releaseTasks = [project.ntcoreZip]
+
+    if (includeJava) {
+        releaseTasks.add(project.jar)
+    }
+
+    project.releaseSetup(releaseTasks)
 
     project.tasks.whenTaskAdded { task ->
         def name = task.name.toLowerCase()
diff --git a/toolchains/arm.gradle b/toolchains/arm.gradle
index 4faa6f3c6d..144a8bde59 100644
--- a/toolchains/arm.gradle
+++ b/toolchains/arm.gradle
@@ -65,7 +65,7 @@ ext.setupDebugDefines = { cppCompiler, linker ->
     cppCompiler.args '-g', '-O0'
 }
 
-ext.releaseSetup = { releaseTask ->
+ext.releaseSetup = { releaseTasks ->
     binaries.withType(SharedLibraryBinarySpec) { binary ->
         if (!project.hasProperty('debug')) {
             def library = binary.sharedLibraryFile.absolutePath
@@ -88,7 +88,7 @@ ext.releaseSetup = { releaseTask ->
                     }
                 }
             }
-            releaseTask.dependsOn project.tasks.getByName("secondObjcopy${binary.name}")
+            releaseTasks.each { it.dependsOn project.tasks.getByName("secondObjcopy${binary.name}") }
         }
     }
 }
diff --git a/toolchains/linux.gradle b/toolchains/linux.gradle
index 9295604215..415b92199d 100644
--- a/toolchains/linux.gradle
+++ b/toolchains/linux.gradle
@@ -41,7 +41,7 @@ ext.setupDebugDefines = { cppCompiler, linker ->
     cppCompiler.args '-g', '-O0'
 }
 
-ext.releaseSetup = { releaseTask ->
+ext.releaseSetup = { releaseTasks ->
     binaries.withType(SharedLibraryBinarySpec) { binary ->
         if (!project.hasProperty('debug')) {
             def library = binary.sharedLibraryFile.absolutePath
@@ -64,7 +64,7 @@ ext.releaseSetup = { releaseTask ->
                     }
                 }
             }
-            releaseTask.dependsOn project.tasks.getByName("secondObjcopy${binary.name}")
+            releaseTasks.each { it.dependsOn project.tasks.getByName("secondObjcopy${binary.name}") }
         }
     }
 }
diff --git a/toolchains/mac.gradle b/toolchains/mac.gradle
index 9c6f410964..20fe88476d 100644
--- a/toolchains/mac.gradle
+++ b/toolchains/mac.gradle
@@ -30,7 +30,7 @@ ext.setupDebugDefines = { cppCompiler, linker ->
     cppCompiler.args '-g', '-O0'
 }
 
-ext.releaseSetup = { releaseTask ->
+ext.releaseSetup = { releaseTasks ->
     binaries.withType(SharedLibraryBinarySpec) { binary ->
         if (!project.hasProperty('debug')) {
             def library = binary.sharedLibraryFile.absolutePath
@@ -48,7 +48,7 @@ ext.releaseSetup = { releaseTask ->
                     }
                 }
             }
-            releaseTask.dependsOn project.tasks.getByName("strip${binary.name}")
+            releaseTasks.each { it.dependsOn project.tasks.getByName("strip${binary.name}")
         }
     }
 }