diff --git a/.travis.yml b/.travis.yml
index 49144ec..da59f30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,7 @@ env:
   - secure: KUqRhjXJCq1HFFeYGJZ40w18UyDOwdmm+mekco8nDCFMGpLxzzPoiYfn3/2TT7ZQ2a4kCu43TZq2y+EsHBb4jGui8qKP0jSnOBnX0SAS8SLWqCH4YltEs2JJHPyUxcxdpBm7uGdaDzl/txNvorVjkACuMzqe1aKIbVQD6H6pYLQsSaFTa0VMuBNo2g9gC3k9sSLqTGRTyrzaXqJaZiTrXGYPXYlsrIXBtaAU9+3eWqcDJ8TpH+/Pkrh5i8On+Hz8t8lr5lRThWXz8T2OqYJfw9BbJMlOpf0u0YuxtTRyP2RR3XRWgqSoPY0Ic78JIiXOM6s2GLaGIX6OBcxh411VcgzBfgKFYb/+lrUzDVz1Wtu0Ptwj4GgxmcWEleR+y1o/iXkuXwshOWSe5gn1fKB7fILA2ueZRN8nEzuDC61WRswcLcQlz2rRXvK3y7Ez46IHI6QGMrIEa+oOte+rCAXyw4+CK4XtFZS5CP2T2UqoNL9DQ+h9lVMdlpN5Y7rZ+cnyVijA5Ja72yQwP7tnO2qAxAO1BBZQ2hmJGI+DxlZ8uNyM8nphy33J5PDCdZvJdkkf6qNvW6JNWcrYDmxtB8hPiNy/gdebcViYiKLI5U9+DBqXmUQugylYIp4oN/ulMRk7Yi8X6fTT6nLPnwwVrxgHE8xMIvAVobDTcZD1BC8/tT4=
   - secure: BZ7PSGt4hWHscrTEp1OKtuHCkVVjpbaRtTcnm3iY3YSXd5vj8Lq52rZyP0+py0vxVji/Vz0dOlovsfyeOiFe9npy4JqqbtlgHNdMwYd4Muzg/QBtKde9w0QUZfBUxqVuLDEft+DZNXblhmnAlXBvpBufIOpk/FfRYRuB1f0TdZCSJSrVdRVmEthzZ4P1xanQtCfoArN0UztsFSu5ycfPRz22akPEIKeJPQKuhFyGaq/INBk1Y0h42Cs+oWJN5aaXG/IxmCTT/670AV30ooLk4i7pmM2rBAXW6dmprIGVdjXTP5SOMeIbnXUJrtqiO8lZGYU+0dGwQHWAUGuqJrVc+V9j4o8isxD9QFZwydPxifdQq7/ml/vV3nQTR+Qxm5glsWh0NylW1jgYPuda2YsREXuUN0zx9Z+ljdkBlcYkdE+lEXcUtpTVoDnEwh6xFmKsg1uVyDjhK8lgK6DcXNXBE6wadRRYOs6pRxdh8+vKh70ESVI2iE/6fcif5WWbLNbpKFtKlsFHvoxFUWF6A9qy97FXtCnveEZ8gJPUSIOwF/E/zZUotvychWWFRlN702cBzVglVFz8DJsWm4UnpywvHipJRpeuFbeHbrpqFHavP4KNO0Tfscc1pYlYmeKPPdpJt060giTMjn062eZ7y4SGnSRYdYr1Jt3j5Ox25MeT6Cc=
   - secure: 1OfMY9XZoUx87/HwO56Zas+4BjiDF04CRZrVVM9n+Pe/S40v+A2CH7ZYhojL3ZLsy5irBq6yRVGtFA4iwrCkuS4PgynNmccRTW1rLEHFVFV6l+3IOFDMQ6q4yYipIDXGvIeqRR1+7ovnh3zmmxVYTFRZwHRnsAah6Us8kOaCEGtWmQs1U6YWcok0oXCx68nV/GDSlg1Ok+mDuY1CTPwl8XgNpIlMHL9/+Op92JzK8NHHZINx3CuXa5JxSSSanJx0vKVz2uYaKMTQB9oWLn5k+ySEWwl1nKOX/6HSg0nVGHMxukkNZEvewguyKWfJXJSZg6fGaz5YwWdJNux132IuhaWoJLDInip4hwJp70VW5oteC41yw+O6S9PRx3DrGKGElKkLJRVOhZfiGBlezfGdPDHjUkw75yST/wLXBAbyhUDAjq04mU683XxZrhGwUhZ9pI9cXGC5I3dC7mrFoo1cg76xfzBMnOMFy2FcJyDAELYEIYF9HwC5AEbYMIJ+v25Ax49kVUpeKg7VJlZCkJ7Y3A744R1PxspX4OKFN21CidFkB748SAw5C84zw+kJlQTNw2paWfk/AXYqGVVk6eVWNSsKvXPbG2hFNKJBHSQcbjl7ajzfqCm6VZTzeDGXH0Ll+Oj/bUo9lGlPjiJfIJ3XGjEE9Z19xw6UDPTM/7tepQY=
+  - secure: qCaa2SUkiBW4UIjFApgzHdPTIiI3Er/V8GtpbpjF+E+QsHCnN324/Blg5neZW+kt/sDHK4LvWWN1q9FxUZz/+U1ERNQrwy9z8ZIA0yWVS5eYPju+8Z6bBBVLGbQlrc6Kr707p6YmHLIYa8cEfY2/g+pPefUU5yuqvE6ErNtfVjWzCLognPl8muIUku2Kh0mqOlvlwchB21o/vkiEJbZNMyBeV7yRKOQGHz5c5H5RTmaqy0Bf1MmRvOWCgoG0AxEAu34L6y2e4DId02+QOmNGPLdbx/iOrce4yCQwdqpG7c9FhGVnzVQM4q695uVOx0gC5aayMscNQH55dM5/dbO1K5y9Jc6WoJpnVpYMkTKXIm6v5hgOQZKrK8g5ncR7wbtVwKASI0RG0CIiov3joYO6MrmIKx312Wq0RF3SJfCG50oRu7EMS5nlRr3jN1x3FYTR+8lDV8WwXYH6qyIpXK5/AyE9/9/GyBOHonYlFpHdPbhiGrT6fgxqlU4+QPf7VvrU7Lqe+5L1YJ67mXZjN6a8G1i7jdoLIb/0k0SK9357oWQt6httN6x6OxuufL+cj8sb73TCXVspM8Qtuvs4tm7CkewHVDxVcuJe8TkPdksgstE1gANSBNUey8J8tcpQcxB3+bip+XUa3hvqe67UbGkv9n6MNeTL+p/fv6A9eduYyvQ=
 after_success:
 - "./deploy_snapshot.sh"
 after_failure: cat /home/travis/build/sockeqwe/AdapterDelegates/library/build/outputs/lint-results-debug.xml
diff --git a/README.md b/README.md
index be18ebe..318b23a 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Read the motivation for this project in [my blog post](http://hannesdorfmann.com
 This library is available on maven central:
 
 ```groovy
-compile 'com.hannesdorfmann:adapterdelegates3:3.0.1'
+compile 'com.hannesdorfmann:adapterdelegates3:3.1.0'
 ```
 [![Build Status](https://travis-ci.org/sockeqwe/AdapterDelegates.svg?branch=master)](https://travis-ci.org/sockeqwe/AdapterDelegates)
 
@@ -14,7 +14,7 @@ Please note that since 3.0 the group id has been changed to `adapterdelegates3`.
 ### Snapshot
 
 ```groovy
-compile 'com.hannesdorfmann:adapterdelegates3:3.0.2-SNAPSHOT'
+compile 'com.hannesdorfmann:adapterdelegates3:3.1.1-SNAPSHOT'
 ```
 
 You also have to add the url to the snapshot repository:
diff --git a/deploy_snapshot.sh b/deploy_snapshot.sh
index 9b91c97..7c42665 100755
--- a/deploy_snapshot.sh
+++ b/deploy_snapshot.sh
@@ -24,6 +24,14 @@ else
   openssl aes-256-cbc -K $encrypted_a046bd9bf3a5_key -iv $encrypted_a046bd9bf3a5_iv -in .travis/key.enc -out .travis/key -d
   gpg --import .travis/key
   gpg --list-keys
-  ./gradlew clean uploadArchives
+  echo "signing.keyId=E508C045" >> library/gradle.properties
+  echo "signing.password=$PGP_KEY" >> library/gradle.properties
+  echo "signing.secretKeyRingFile=$PWD/.travis/key" >> library/gradle.properties
+  echo "org.gradle.parallel=false" >> gradle.properties
+  echo "org.gradle.configureondemand=false" >> gradle.properties
+  ./gradlew stop
+  ./gradlew  --no-daemon :library:uploadArchives -Dorg.gradle.parallel=false -Dorg.gradle.configureondemand=false
+  rm .travis/key
+  git reset --hard
   echo "Snapshot deployed!"
 fi
diff --git a/gradle.properties b/gradle.properties
index 5c41fa4..4a2b52e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -33,4 +33,5 @@ POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=hannesdorfmann
 POM_DEVELOPER_NAME=Hannes Dorfmann
 
-signing.keyId=D2FC4C0B
+signing.keyId=E508C045
+
diff --git a/library/build.gradle b/library/build.gradle
index b594af3..327ecdd 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,44 +1,48 @@
 apply plugin: 'com.android.library'
-apply plugin: "com.vanniktech.maven.publish"
+
+gradle.ext.isCiServer = System.getenv().containsKey("CI")
+logger.warn("Running on CI: ${gradle.ext.isCiServer}")
+
+if (gradle.ext.isCiServer) {
+    apply plugin: "com.vanniktech.maven.publish"
+    mavenPublish {
+        releaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+        snapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
+    }
+}
 
 android {
-  compileSdkVersion 28
-
-  defaultConfig {
-    minSdkVersion 14
-    targetSdkVersion 28
-    versionCode 2
-    versionName "3.0"
-  }
-  buildTypes {
-    release {
-      minifyEnabled false
-      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+    compileSdkVersion 28
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 28
+        versionCode 2
+        versionName "3.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
     }
-  }
 
-  compileOptions {
-    sourceCompatibility rootProject.ext.javaSourceCompatibility
-    targetCompatibility rootProject.ext.javaTargetCompatibility
-  }
+    compileOptions {
+        sourceCompatibility rootProject.ext.javaSourceCompatibility
+        targetCompatibility rootProject.ext.javaTargetCompatibility
+    }
 
-  libraryVariants.all {
-    it.generateBuildConfig.enabled = false
-  }
+    libraryVariants.all {
+        it.generateBuildConfig.enabled = false
+    }
 }
 
 dependencies {
-  api rootProject.ext.recyclerView
+    api rootProject.ext.recyclerView
 
-  testImplementation 'junit:junit:4.12'
-  testImplementation 'org.mockito:mockito-inline:2.21.0'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-inline:2.21.0'
 }
 
 // apply from: 'https://raw.github.com/sockeqwe/gradle-mvn-push/master/gradle-mvn-push.gradle'
 apply from: 'https://raw.githubusercontent.com/Tickaroo/findbugs-script/master/findbugs.gradle'
-
-
-mavenPublish {
-  releaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-  snapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-}
diff --git a/library/gradle.properties b/library/gradle.properties
index 80a7300..282407a 100644
--- a/library/gradle.properties
+++ b/library/gradle.properties
@@ -15,4 +15,4 @@
 #
 POM_NAME = AdapterDelegates
 POM_ARTIFACT_ID = adapterdelegates3
-POM_PACKAGING = aar
\ No newline at end of file
+POM_PACKAGING = aar