diff --git a/.travis.yml b/.travis.yml
index 1e232e7b..91a7bb96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,12 @@
 language: java
 jdk:
   - oraclejdk8
+after_success:
+- bash <(curl -s https://codecov.io/bash)
 before_install:
-  - gradle wrapper
+  - gradle -b gradle/wrapper.gradle
+  - mv gradle/gradlew gradle/gradlew.bat .
+  - mv gradle/gradle/wrapper gradle/
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
diff --git a/build.gradle b/build.gradle
index f8a414e4..89929478 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,11 +2,6 @@ plugins {
     id 'org.jetbrains.kotlin.jvm' version "1.2.60" apply(false)
 }
 
-wrapper {
-    gradleVersion = "4.9"
-    distributionType = Wrapper.DistributionType.ALL
-}
-
 allprojects {
     group = 'apollo'
     version = '0.0.1'
@@ -20,4 +15,5 @@ allprojects {
 
 apply from: 'gradle/properties.gradle'
 apply from: 'gradle/kotlin.gradle'
-apply from: 'gradle/jacoco.gradle'
\ No newline at end of file
+apply from: 'gradle/jacoco.gradle'
+apply from: 'gradle/wrapper.gradle'
\ No newline at end of file
diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle
index 9d926762..31ff7aec 100644
--- a/gradle/jacoco.gradle
+++ b/gradle/jacoco.gradle
@@ -43,7 +43,7 @@ task jacocoTestReport(type: JacocoReport) {
      */
     doFirst {
         subprojects.findAll { subproject ->
-            subproject.pluginManager.hasPlugin('java')
+            subproject.pluginManager.hasPlugin('java') || subproject.pluginManager.hasPlugin('kotlin')
         }.each { subproject ->
             additionalSourceDirs files((Set<File>) subproject.sourceSets.main.allJava.srcDirs)
             additionalClassDirs((FileCollection) subproject.sourceSets.main.output)
diff --git a/gradle/wrapper.gradle b/gradle/wrapper.gradle
new file mode 100644
index 00000000..35e4d7dd
--- /dev/null
+++ b/gradle/wrapper.gradle
@@ -0,0 +1,3 @@
+wrapper {
+    gradleVersion = "4.9"
+}