diff --git a/Java/MoppyControlGUI/build.gradle b/Java/MoppyControlGUI/build.gradle
index 0902358..a204e5b 100644
--- a/Java/MoppyControlGUI/build.gradle
+++ b/Java/MoppyControlGUI/build.gradle
@@ -6,12 +6,15 @@ plugins {
     id 'application'
 }
 
-mainClassName = 'com.moppy.control.MoppyControlGUI'
-version = '2.1.0'
+application {
+    mainClass.set('com.moppy.control.MoppyControlGUI')
+}
+
+version = '2.2.0'
 
 jar {
     manifest {
-        attributes ('Main-Class': mainClassName,
+        attributes ('Main-Class': application.mainClass,
                     'Implementation-Title': project.name,
                     'Implementation-Version': version)
     }
@@ -40,8 +43,3 @@ dependencies {
     // Use JUnit test framework
     //testImplementation 'junit:junit:4.12'
 }
-
-application {
-    // Define the main class for the application.
-    mainClassName = 'com.moppy.control.MoppyControlGUI'
-}
diff --git a/Java/MoppyDeviceGUI/build.gradle b/Java/MoppyDeviceGUI/build.gradle
index e5ec752..79bc8ab 100644
--- a/Java/MoppyDeviceGUI/build.gradle
+++ b/Java/MoppyDeviceGUI/build.gradle
@@ -1,9 +1,10 @@
 apply plugin: 'java'
 apply plugin: 'application'
 
-mainClassName = 'com.moppy.device.gui.MoppyDeviceGUI'
+application {
+    mainClass.set('com.moppy.device.gui.MoppyDeviceGUI')
+}
 
-sourceCompatibility = '1.8'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 // NetBeans will automatically add "run" and "debug" tasks relying on the
@@ -25,6 +26,6 @@ repositories {
 }
 
 dependencies {
-    compile project(':MoppyLib')
-    compile 'com.jsyn:jsyn:+' // For sound synthesizing
+    implementation project(':MoppyLib')
+    implementation 'com.jsyn:jsyn:+' // For sound synthesizing
 }
diff --git a/Java/MoppyLib/build.gradle b/Java/MoppyLib/build.gradle
index 4c2c746..5a86aa4 100644
--- a/Java/MoppyLib/build.gradle
+++ b/Java/MoppyLib/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'java-library'
 }
 
-version = '2.1.0'
+version = '2.2.0'
 
 jar {
     manifest {