diff --git a/.travis.yml b/.travis.yml
index dbe7b91..bf31aa0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,8 @@ android:
     - tools # to get the new `repository-11.xml`
     - platform-tools
     - tools # to install Android SDK tools 25.1.x (x = 6 right now)
-    - build-tools-26.0.2
-    - android-26
+    - build-tools-27.0.3
+    - android-27
     - extra-google-m2repository
     - extra-android-m2repository
 
diff --git a/CHANGELOG b/CHANGELOG
index c2caddb..dbcdb25 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,10 @@
 # Releases
 
+## v0.3.6
+* update support lib version to 27.1.1
+* update Gradle to 4.7 and Android Gradle Plugin to 3.1.1
+* fix possible memory leak in placeholder transition drawable (thx @buptfarmer)
+
 ## v0.3.5
 * update support lib version to 26.1.0
 * raise minSdk from 10 to 14 due to requirements by support-libs
diff --git a/app/src/main/java/at/favre/app/dalitest/activity/DebugActivity.java b/app/src/main/java/at/favre/app/dalitest/activity/DebugActivity.java
index 4fda25e..618b907 100644
--- a/app/src/main/java/at/favre/app/dalitest/activity/DebugActivity.java
+++ b/app/src/main/java/at/favre/app/dalitest/activity/DebugActivity.java
@@ -14,7 +14,7 @@ public class DebugActivity extends PopHoodActivity {
     @Override
     public Pages getPageData(@NonNull Pages emptyPages) {
         Page page = emptyPages.addNewPage();
-        page.add(DefaultProperties.createSectionSourceControlAndCI(BuildConfig.GIT_REV, BuildConfig.GIT_BRANCH, BuildConfig.GIT_DATE, BuildConfig.BUILD_NUMBER, null, BuildConfig.BUILD_DATE));
+//        page.add(DefaultProperties.createSectionSourceControlAndCI(BuildConfig.GIT_REV, BuildConfig.GIT_BRANCH, BuildConfig.GIT_DATE, BuildConfig.BUILD_NUMBER, null, BuildConfig.BUILD_DATE));
         page.add(DefaultProperties.createSectionBasicDeviceInfo());
         page.add(DefaultProperties.createDetailedDeviceInfo(this));
         page.add(DefaultProperties.createSectionAppVersionInfoFromBuildConfig(BuildConfig.class));
diff --git a/build.gradle b/build.gradle
index 030f3c3..02edc69 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,9 +4,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
     }
 }
 
@@ -24,16 +24,16 @@ allprojects {
 apply from: "$rootDir/gradle/common-build.gradle"
 
 ext {
-    versionName = "0.3.5"
+    versionName = "0.3.6"
     versionCode = getCiBuildNumber()
-    compileSdkVersion = 26
-    buildToolsVersion = "26.0.2"
-    targetSdkVersion = 26
+    compileSdkVersion = 27
+    buildToolsVersion = "27.0.3"
+    targetSdkVersion = 27
     minSdkVersion = 14
     renderscriptTargetApi = 20
 
     dependencies = [
-            support: "26.1.0"
+            support: "27.1.1"
     ]
 }
 
diff --git a/dali/build.gradle b/dali/build.gradle
index a874a8a..eee0097 100644
--- a/dali/build.gradle
+++ b/dali/build.gradle
@@ -54,9 +54,9 @@ android {
 }
 
 dependencies {
-    implementation 'com.jakewharton:disklrucache:2.0.2'
+    api 'com.jakewharton:disklrucache:2.0.2'
+    api "com.android.support:recyclerview-v7:$rootProject.ext.dependencies.support"
     implementation "com.android.support:appcompat-v7:$rootProject.ext.dependencies.support"
-    implementation "com.android.support:recyclerview-v7:$rootProject.ext.dependencies.support"
 }
 
 apply from: "$rootDir/gradle/publish.gradle"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e5652c0..6a5c8e6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip