diff --git a/app/build.gradle b/app/build.gradle
index 1f290ff4..d12aafc7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 18
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 66
         versionName "2.6.0"
         resConfigs "en"
@@ -40,10 +40,9 @@ dependencies {
     //noinspection GradleDependency
     implementation 'com.google.android.gms:play-services-wearable:10.2.0'
 
-    //noinspection GradleDependency
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    //noinspection GradleDependency
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
 
     implementation 'no.nordicsemi.android:log:2.1.1'
     implementation 'no.nordicsemi.android.support.v18:scanner:1.1.0'
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0a3d1617..b953b72a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -124,8 +124,7 @@
 	</style>
 
 	<style name="AppTheme" parent="@style/AppThemeBase">
-		<item name="android:selectableItemBackground">@drawable/abc_item_background_holo_light
-		</item>
+		<item name="android:selectableItemBackground">@drawable/abc_item_background_holo_light</item>
 	</style>
 
 	<style name="AppTheme.TranslucentStatusBar">
diff --git a/build.gradle b/build.gradle
index 5975f391..de0b38e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/common/build.gradle b/common/build.gradle
index 24e99f97..8de4e520 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         resConfigs "en"
@@ -28,7 +28,5 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    //noinspection GradleDependency
-    implementation 'com.android.support:support-core-utils:27.1.1'
+    implementation 'com.android.support:support-core-utils:28.0.0'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 87376f11..d46687a8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 11 09:34:16 CEST 2018
+#Fri Sep 28 10:32:07 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/wear/build.gradle b/wear/build.gradle
index d4943e0a..06df7dee 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -3,13 +3,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 23
-        targetSdkVersion 27
-        versionCode 272606601 // target: 27, version: 2.6.0, build: 66, multi-APK: 01
+        targetSdkVersion 28
+        versionCode 282606601 // target: 28, version: 2.6.0, build: 66, multi-APK: 01
         versionName "2.6.0"
         resConfigs "en"
     }
@@ -39,29 +39,20 @@ configurations.all() { configuration -> exclude group: "org.apache.httpcomponent
 
 dependencies {
     implementation project(':common')
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'no.nordicsemi.android.support.v18:scanner:1.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'com.android.support:percent:28.0.0'
     implementation 'com.google.android.support:wearable:2.3.0'
     compileOnly 'com.google.android.wearable:wearable:2.3.0'
 
+    implementation 'no.nordicsemi.android.support.v18:scanner:1.1.0'
+
     // uncomment to enable the Wear UI Library
     // https://developer.android.com/training/wearables/ui/wear-ui-library.html
-    // implementation 'com.android.support:wear:27.0.2'
+    // implementation 'com.android.support:wear:28.0.0'
 
     // nRF Toolbox is using Play Service 10.2.0 in order to make the app working in China:
     // https://developer.android.com/training/wearables/apps/creating-app-china.html#ChinaSDK
     //noinspection GradleDependency
     implementation 'com.google.android.gms:play-services-wearable:10.2.0'
 }
-
-// temporary workaround for support library version mismatch
-configurations.all {
-    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-        def requested = details.requested
-        if (requested.group == 'com.android.support') {
-            if (!requested.name.startsWith("multidex")) {
-                details.useVersion '27.0.2'
-            }
-        }
-    }
-}
\ No newline at end of file