aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2026-01-08 17:24:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Android Studio 3.2.0

Browse Source
This commit is contained in:
Aleksander Nowakowski
2018-09-28 11:06:58 +02:00
parent d3cbc2fcab
commit 75afb02b51
6 changed files with 22 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/build.gradle
View File

@@ -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'

3
app/src/main/res/values/styles.xml
View File

@@ -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">

2
build.gradle
View File

@@ -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

8
common/build.gradle
View File

@@ -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'
}

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -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

27
wear/build.gradle
View File

@@ -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'
}
}
}
}