diff --git a/android/build.gradle b/android/build.gradle
index 729d702f40..acfd9e6510 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -20,6 +20,7 @@ allprojects {
     plugins.withType(JavaPlugin) {
         dependencies {
             implementation libs.annotations
+            testImplementation libs.junit
         }
     }
 }
diff --git a/java_console/autoupdate/build.gradle b/java_console/autoupdate/build.gradle
index 4b8777ee7d..8b85bf87aa 100644
--- a/java_console/autoupdate/build.gradle
+++ b/java_console/autoupdate/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'java'
+    id 'java-library'
 }
 
 apply from: '../../android/dependencies.gradle'
@@ -10,11 +10,10 @@ configurations {
 
 dependencies {
     implementation libs.javaxJson
-    implementation project(':inifile')
+    api project(':inifile')
     implementation project(':logging-api')
     implementation project(':shared_io')
 
-    implementation libs.annotations
     implementation group: 'com.fazecast', name: 'jSerialComm', version: '2.6.2'
     implementation group: 'net.jcip', name: 'jcip-annotations', version: '1.0'
     implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
diff --git a/java_console/inifile/build.gradle b/java_console/inifile/build.gradle
index 2c0b0503ae..405c2ee1ec 100644
--- a/java_console/inifile/build.gradle
+++ b/java_console/inifile/build.gradle
@@ -1,13 +1,10 @@
 plugins {
-    id 'java'
+    id 'java-library'
 }
 
 apply from: '../../android/dependencies.gradle'
 
 dependencies {
-    implementation project(':logging-api')
-    implementation project(':shared_io')
-    implementation libs.annotations
-
-    testImplementation libs.junit
+    api project(':logging-api')
+    api project(':shared_io')
 }
diff --git a/java_console/io/build.gradle b/java_console/io/build.gradle
index ed55002d61..2ab8d0a091 100644
--- a/java_console/io/build.gradle
+++ b/java_console/io/build.gradle
@@ -21,7 +21,6 @@ dependencies {
     implementation project(':shared_io')
     implementation project(':logging')
 
-    implementation libs.annotations
     implementation group: 'com.fazecast', name: 'jSerialComm', version: '2.9.0'
     implementation group: 'net.jcip', name: 'jcip-annotations', version: '1.0'
     implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
diff --git a/java_console/models/build.gradle b/java_console/models/build.gradle
index b8b389d2d5..788d5889c7 100644
--- a/java_console/models/build.gradle
+++ b/java_console/models/build.gradle
@@ -1,17 +1,10 @@
 plugins {
-    id 'java'
+    id 'java-library'
 }
 
 apply from: '../../android/dependencies.gradle'
 
 dependencies {
-    implementation project(':inifile')
-    implementation project(':logging-api')
-    implementation project(':autoupdate')
-    implementation project(':shared_io')
-    implementation project(':inifile')
-    implementation libs.annotations
+    api project(':autoupdate')
     implementation libs.snakeyaml
-
-    testImplementation libs.junit
 }
\ No newline at end of file
diff --git a/java_tools/bin2header/build.gradle b/java_tools/bin2header/build.gradle
index 8b3bc83530..1d91ac3373 100644
--- a/java_tools/bin2header/build.gradle
+++ b/java_tools/bin2header/build.gradle
@@ -6,11 +6,6 @@ defaultTasks 'jar'
 
 apply from: '../../android/dependencies.gradle'
 
-dependencies {
-    testImplementation libs.junit
-    implementation libs.annotations
-}
-
 jar {
     destinationDirectory = file( '$rootDir/../..' )
     manifest {