From c236b0cfb970c668ba6e8e7a9b64fcd44433fe27 Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Wed, 11 Apr 2018 10:30:18 +0200 Subject: [PATCH] Android Studio 3.1, support libs 27.1.1 --- app/build.gradle | 6 +++--- build.gradle | 2 +- common/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- wear/build.gradle | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 253302ef..cdb93136 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 27 - buildToolsVersion "27.0.1" + buildToolsVersion "27.0.3" defaultConfig { applicationId "no.nordicsemi.android.nrftoolbox" @@ -41,9 +41,9 @@ dependencies { implementation 'com.google.android.gms:play-services-wearable:10.2.0' //noinspection GradleDependency - implementation 'com.android.support:appcompat-v7:27.0.2' + implementation 'com.android.support:appcompat-v7:27.1.1' //noinspection GradleDependency - implementation 'com.android.support:design:27.0.2' + implementation 'com.android.support:design:27.1.1' implementation 'no.nordicsemi.android:log:2.1.1' implementation 'no.nordicsemi.android.support.v18:scanner:1.0.0' diff --git a/build.gradle b/build.gradle index d83d7bac..3a3b44a8 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.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 97b1533a..24e99f97 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -30,5 +30,5 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //noinspection GradleDependency - implementation 'com.android.support:support-core-utils:27.0.2' + implementation 'com.android.support:support-core-utils:27.1.1' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 82c50a8d..87376f11 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Oct 23 10:50:01 CEST 2017 +#Wed Apr 11 09:34:16 CEST 2018 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.4-all.zip diff --git a/wear/build.gradle b/wear/build.gradle index 13741ef2..d4943e0a 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -41,8 +41,8 @@ dependencies { implementation project(':common') implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'no.nordicsemi.android.support.v18:scanner:1.0.0' - implementation 'com.google.android.support:wearable:2.1.0' - compileOnly 'com.google.android.wearable:wearable:2.1.0' + implementation 'com.google.android.support:wearable:2.3.0' + compileOnly 'com.google.android.wearable:wearable:2.3.0' // uncomment to enable the Wear UI Library // https://developer.android.com/training/wearables/ui/wear-ui-library.html