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

Merge pull request #71 from NordicSemiconductor/develop

Browse Source 
Release v2.7.2
This commit is contained in:
Roshan Rajaratnam
2019-04-08 13:56:59 +02:00
committed by GitHub
parent e77097c6ce 2b9072eb8a
commit 08b67a28c9
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@@ -8,8 +8,8 @@ android {
applicationId "no.nordicsemi.android.nrftoolbox" applicationId "no.nordicsemi.android.nrftoolbox"
minSdkVersion 18 minSdkVersion 18
targetSdkVersion 28 targetSdkVersion 28
versionCode 68 versionCode 69
versionName "2.7.1" versionName "2.7.2"
resConfigs "en" resConfigs "en"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
@@ -42,7 +42,7 @@ dependencies {
//noinspection GradleDependency //noinspection GradleDependency
implementation 'com.google.android.gms:play-services-wearable:10.2.0' implementation 'com.google.android.gms:play-services-wearable:10.2.0'
implementation 'androidx.appcompat:appcompat:1.1.0-alpha03' implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
implementation 'androidx.preference:preference:1.1.0-alpha04' implementation 'androidx.preference:preference:1.1.0-alpha04'
implementation 'com.google.android.material:material:1.1.0-alpha05' implementation 'com.google.android.material:material:1.1.0-alpha05'

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

@@ -98,7 +98,7 @@
</style> </style>
<style name="Widget.Connect" parent="@style/Widget.MaterialComponents.Button"> <style name="Widget.Connect" parent="@style/Widget.MaterialComponents.Button">
<item name="android:theme">@style/ConnectTheme</item> <item name="theme">@style/ConnectTheme</item>
<item name="android:minWidth">200dp</item> <item name="android:minWidth">200dp</item>
<item name="android:minHeight">52dp</item> <item name="android:minHeight">52dp</item>
</style> </style>

6
wear/build.gradle
View File

@@ -9,8 +9,8 @@ android {
applicationId "no.nordicsemi.android.nrftoolbox" applicationId "no.nordicsemi.android.nrftoolbox"
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 28 targetSdkVersion 28
versionCode 282716802 // target: 28, version: 2.6.0, build: 68, multi-APK: 01 versionCode 282726903 // target: 28, version: 2.6.0, build: 68, multi-APK: 01
versionName "2.7.1" versionName "2.7.2"
resConfigs "en" resConfigs "en"
} }
lintOptions { lintOptions {
@@ -39,7 +39,7 @@ configurations.all() { configuration -> exclude group: "org.apache.httpcomponent
dependencies { dependencies {
implementation project(':common') implementation project(':common')
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha03' implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha04'
implementation 'androidx.percentlayout:percentlayout:1.0.0' implementation 'androidx.percentlayout:percentlayout:1.0.0'
implementation 'com.google.android.support:wearable:2.4.0' implementation 'com.google.android.support:wearable:2.4.0'
compileOnly 'com.google.android.wearable:wearable:2.4.0' compileOnly 'com.google.android.wearable:wearable:2.4.0'