diff --git a/build.gradle b/build.gradle
index 5d78e4de4..5fa1ba06f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,8 +9,8 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.0'
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0'
-        classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:1.2.0'
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
+        classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:2.0.0'
     }
 }
 
diff --git a/rxandroidble/build.gradle b/rxandroidble/build.gradle
index ec40fe418..0e4980474 100644
--- a/rxandroidble/build.gradle
+++ b/rxandroidble/build.gradle
@@ -42,18 +42,8 @@ android {
     preBuild.dependsOn 'checkstyle'
 }
 
-// Workaround until groovy-android-gradle-plugin 1.3.0 is released
-tasks.whenTaskAdded { task ->
-    if (task.name.contains('UnitTestGroovyWithGroovyc')) {
-        task.doFirst {
-            ['debug','release'].each {
-                def dir = file("build/generated/source/apt/test/$it")
-                if(!dir.isDirectory()){
-                    dir.mkdirs()
-                }
-            }
-        }
-    }
+androidGroovy {
+    skipJavaC = true
 }
 
 dependencies {
diff --git a/rxandroidble/src/main/java/com/polidea/rxandroidble/internal/serialization/QueueSemaphore.java b/rxandroidble/src/main/java/com/polidea/rxandroidble/internal/serialization/QueueSemaphore.java
index dc60b1d73..41d996f58 100644
--- a/rxandroidble/src/main/java/com/polidea/rxandroidble/internal/serialization/QueueSemaphore.java
+++ b/rxandroidble/src/main/java/com/polidea/rxandroidble/internal/serialization/QueueSemaphore.java
@@ -16,7 +16,7 @@ public synchronized void awaitRelease() throws InterruptedException {
             } catch (InterruptedException e) {
                 if (!isReleased.get()) {
                     RxBleLog.w(e, "Queue's awaitRelease() has been interrupted abruptly "
-                            + "while it wasn't released byte release() method.");
+                            + "while it wasn't released by the release() method.");
                 }
             }
         }