mirror of
https://github.com/aljazceru/Android-nRF-Toolbox.git
synced 2025-12-21 16:34:23 +01:00
Android Studio 3.1, support libs 27.1.1
This commit is contained in:
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 27
|
compileSdkVersion 27
|
||||||
buildToolsVersion "27.0.1"
|
buildToolsVersion "27.0.3"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "no.nordicsemi.android.nrftoolbox"
|
applicationId "no.nordicsemi.android.nrftoolbox"
|
||||||
@@ -41,9 +41,9 @@ dependencies {
|
|||||||
implementation 'com.google.android.gms:play-services-wearable:10.2.0'
|
implementation 'com.google.android.gms:play-services-wearable:10.2.0'
|
||||||
|
|
||||||
//noinspection GradleDependency
|
//noinspection GradleDependency
|
||||||
implementation 'com.android.support:appcompat-v7:27.0.2'
|
implementation 'com.android.support:appcompat-v7:27.1.1'
|
||||||
//noinspection GradleDependency
|
//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:log:2.1.1'
|
||||||
implementation 'no.nordicsemi.android.support.v18:scanner:1.0.0'
|
implementation 'no.nordicsemi.android.support.v18:scanner:1.0.0'
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ buildscript {
|
|||||||
google()
|
google()
|
||||||
}
|
}
|
||||||
dependencies {
|
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
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
|||||||
@@ -30,5 +30,5 @@ android {
|
|||||||
dependencies {
|
dependencies {
|
||||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
//noinspection GradleDependency
|
//noinspection GradleDependency
|
||||||
implementation 'com.android.support:support-core-utils:27.0.2'
|
implementation 'com.android.support:support-core-utils:27.1.1'
|
||||||
}
|
}
|
||||||
|
|||||||
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
|||||||
#Mon Oct 23 10:50:01 CEST 2017
|
#Wed Apr 11 09:34:16 CEST 2018
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
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
|
||||||
|
|||||||
@@ -41,8 +41,8 @@ dependencies {
|
|||||||
implementation project(':common')
|
implementation project(':common')
|
||||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
implementation 'no.nordicsemi.android.support.v18:scanner:1.0.0'
|
implementation 'no.nordicsemi.android.support.v18:scanner:1.0.0'
|
||||||
implementation 'com.google.android.support:wearable:2.1.0'
|
implementation 'com.google.android.support:wearable:2.3.0'
|
||||||
compileOnly 'com.google.android.wearable:wearable:2.1.0'
|
compileOnly 'com.google.android.wearable:wearable:2.3.0'
|
||||||
|
|
||||||
// uncomment to enable the Wear UI Library
|
// uncomment to enable the Wear UI Library
|
||||||
// https://developer.android.com/training/wearables/ui/wear-ui-library.html
|
// https://developer.android.com/training/wearables/ui/wear-ui-library.html
|
||||||
|
|||||||
Reference in New Issue
Block a user