diff --git a/build.gradle b/build.gradle
index d336fc68..6e71690e 100755
--- a/build.gradle
+++ b/build.gradle
@@ -29,5 +29,5 @@ allprojects {
 }
 
 tasks.register('clean', Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }
diff --git a/tools/make-emoji-keys/build.gradle b/tools/make-emoji-keys/build.gradle
index 6e136649..a29ae07e 100644
--- a/tools/make-emoji-keys/build.gradle
+++ b/tools/make-emoji-keys/build.gradle
@@ -16,8 +16,9 @@ jar {
 
 }
 
-task makeEmoji(type: JavaExec, dependsOn: ['jar']) {
-    main = '-jar'
+tasks.register('makeEmoji', JavaExec) {
+    dependsOn['jar']
+    mainClass = '-jar'
     args jar.archiveFile.get()
     args '-res'
     args project.rootProject.project('app').projectDir.path + File.separator + 'src' +
diff --git a/tools/make-keyboard-text/build.gradle b/tools/make-keyboard-text/build.gradle
index 4b17139c..b6af733b 100644
--- a/tools/make-keyboard-text/build.gradle
+++ b/tools/make-keyboard-text/build.gradle
@@ -8,8 +8,9 @@ jar {
     }
 }
 
-task makeText(type: JavaExec, dependsOn: ['jar']) {
-    main = '-jar'
+tasks.register('makeText', JavaExec) {
+    dependsOn['jar']
+    mainClass = '-jar'
     args jar.archiveFile.get()
     args '-java'
     args project.rootProject.project('app').projectDir.path + File.separator + 'src' +