aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-22 08:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dependencies updated

Browse Source
This commit is contained in:
Aleksander Nowakowski
2017-06-28 16:20:36 +02:00
parent f3cd55a756
commit c0075b400c
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion 25 compileSdkVersion 25
buildToolsVersion '25.0.1' buildToolsVersion '25.0.3'
defaultConfig { defaultConfig {
applicationId "no.nordicsemi.android.nrftoolbox" applicationId "no.nordicsemi.android.nrftoolbox"
@@ -31,8 +31,8 @@ android {
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:25.3.0' compile 'com.android.support:appcompat-v7:25.4.0'
compile 'com.android.support:design:25.3.0' compile 'com.android.support:design:25.4.0'
compile 'no.nordicsemi.android.support.v18:scanner:1.0.0' compile 'no.nordicsemi.android.support.v18:scanner:1.0.0'
compile 'no.nordicsemi.android:log:2.1.0' compile 'no.nordicsemi.android:log:2.1.0'
compile('org.simpleframework:simple-xml:2.7.1') { compile('org.simpleframework:simple-xml:2.7.1') {

5
build.gradle
View File

@@ -5,7 +5,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.0' classpath 'com.android.tools.build:gradle:2.3.3'
// 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
@@ -14,6 +14,9 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
maven {
url "https://maven.google.com"
}
maven { maven {
// nRF Toolbox is using Play Service 7.8.87 in order to make the app working in China: // nRF Toolbox is using Play Service 7.8.87 in order to make the app working in China:
// https://developer.android.com/training/wearables/apps/creating-app-china.html#ChinaSDK // https://developer.android.com/training/wearables/apps/creating-app-china.html#ChinaSDK

4
common/build.gradle
View File

@@ -24,7 +24,7 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion 25 compileSdkVersion 25
buildToolsVersion "25.0.1" buildToolsVersion "25.0.3"
defaultConfig { defaultConfig {
minSdkVersion 18 minSdkVersion 18
@@ -42,5 +42,5 @@ android {
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:support-v4:25.0.1' compile 'com.android.support:support-v4:25.4.0'
} }

5
wear/build.gradle
View File

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
android { android {
publishNonDefault true publishNonDefault true
compileSdkVersion 25 compileSdkVersion 25
buildToolsVersion "25.0.1" buildToolsVersion "25.0.3"
defaultConfig { defaultConfig {
applicationId "no.nordicsemi.android.nrftoolbox" applicationId "no.nordicsemi.android.nrftoolbox"
@@ -31,7 +31,8 @@ android {
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.google.android.support:wearable:2.0.0' compile 'com.google.android.support:wearable:2.0.3'
provided 'com.google.android.wearable:wearable:2.0.3'
// nRF Toolbox is using Play Service 7.8.87 in order to make the app working in China: // nRF Toolbox is using Play Service 7.8.87 in order to make the app working in China:
// https://developer.android.com/training/wearables/apps/creating-app-china.html#ChinaSDK // https://developer.android.com/training/wearables/apps/creating-app-china.html#ChinaSDK
compile 'com.google.android.gms:play-services-wearable:7.8.87' compile 'com.google.android.gms:play-services-wearable:7.8.87'