Skip to content

Commit 518c723

Browse files
philips77philips77
committed
Version 1.16.2
DFU library 0.6.1
1 parent 8f65820 commit 518c723

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

‎app/app.iml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@
7171
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7272
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7373
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/jars" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.0/jars" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.0/jars" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.1/jars" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
7878
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/8.3.0/jars" />
7979
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/8.3.0/jars" />
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wearable/8.3.0/jars" />
8181
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/no.nordicsemi.android.support.v18/scanner/0.1.1/jars" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/no.nordicsemi.android/dfu/0.6/jars" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/no.nordicsemi.android/dfu/0.6.1/jars" />
8383
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/no.nordicsemi.android/log/2.0.0/jars" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
@@ -98,20 +98,20 @@
9898
</content>
9999
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
100100
<orderEntry type="sourceFolder" forTests="false" />
101-
<orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
102-
<orderEntry type="library" exported="" name="design-23.1.0" level="project" />
101+
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
102+
<orderEntry type="library" exported="" name="design-23.1.1" level="project" />
103103
<orderEntry type="library" exported="" name="play-services-wearable-8.3.0" level="project" />
104+
<orderEntry type="library" exported="" name="dfu-0.6.1" level="project" />
104105
<orderEntry type="library" exported="" name="log-2.0.0" level="project" />
105106
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
106-
<orderEntry type="library" exported="" name="dfu-0.6" level="project" />
107-
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" />
107+
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
108+
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
109+
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
108110
<orderEntry type="library" exported="" name="stax-1.2.0" level="project" />
109-
<orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
110111
<orderEntry type="library" exported="" name="play-services-base-8.3.0" level="project" />
111112
<orderEntry type="library" exported="" name="scanner-0.1.1" level="project" />
112113
<orderEntry type="library" exported="" name="achartengine-1.1.0" level="project" />
113114
<orderEntry type="library" exported="" name="simple-xml-2.7.1" level="project" />
114-
<orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
115115
<orderEntry type="library" exported="" name="play-services-basement-8.3.0" level="project" />
116116
<orderEntry type="module" module-name="common" exported="" />
117117
</component>

‎app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "no.nordicsemi.android.nrftoolbox"
99
minSdkVersion 18
1010
targetSdkVersion 23
11-
versionCode 40
12-
versionName "1.16.1"
11+
versionCode 41
12+
versionName "1.16.2"
1313
}
1414
buildTypes {
1515
release {
@@ -22,8 +22,8 @@ android {
2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
2424
compile 'com.google.android.gms:play-services-wearable:8.3.0'
25-
compile 'com.android.support:appcompat-v7:23.1.0'
26-
compile 'com.android.support:design:23.1.0'
25+
compile 'com.android.support:appcompat-v7:23.1.1'
26+
compile 'com.android.support:design:23.1.1'
2727
compile 'no.nordicsemi.android.support.v18:scanner:0.1.1'
2828
compile 'no.nordicsemi.android:log:2.0.0'
2929
compile('org.simpleframework:simple-xml:2.7.1') {
@@ -35,7 +35,7 @@ dependencies {
3535
wearApp project(':wear')
3636

3737
// The DFU Library is imported automatically from jcenter.
38-
compile 'no.nordicsemi.android:dfu:0.6'
38+
compile 'no.nordicsemi.android:dfu:0.6.1'
3939
// If you want to make some changes in the DFU Library, clone the https://github.com/NordicSemiconductor/Android-DFU-Library project into DFULibrary folder,
4040
// add it as a module in Project Structure and uncomment the following line:
4141

‎common/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ android {
4242

4343
dependencies {
4444
compile fileTree(dir: 'libs', include: ['*.jar'])
45-
compile 'com.android.support:support-v4:23.1.0'
45+
compile 'com.android.support:support-v4:23.1.1'
4646
}

‎common/common.iml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
</content>
9090
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
9191
<orderEntry type="sourceFolder" forTests="false" />
92-
<orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
93-
<orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
92+
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
93+
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
9494
</component>
9595
</module>

‎wear/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ android {
99
applicationId "no.nordicsemi.android.nrftoolbox"
1010
minSdkVersion 20
1111
targetSdkVersion 23
12-
versionCode 40
13-
versionName "1.16.1"
12+
versionCode 41
13+
versionName "1.16.2"
1414
}
1515
buildTypes {
1616
release {

‎wear/wear.iml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@
9090
</content>
9191
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
9292
<orderEntry type="sourceFolder" forTests="false" />
93-
<orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
93+
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
94+
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
9495
<orderEntry type="library" exported="" name="play-services-base-8.3.0" level="project" />
9596
<orderEntry type="library" exported="" name="play-services-wearable-8.3.0" level="project" />
9697
<orderEntry type="library" exported="" name="scanner-0.1.1" level="project" />
97-
<orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
9898
<orderEntry type="library" exported="" name="wearable-1.3.0" level="project" />
9999
<orderEntry type="library" exported="" name="play-services-basement-8.3.0" level="project" />
100100
<orderEntry type="library" exported="" name="recyclerview-v7-22.0.0" level="project" />

0 commit comments

Comments
 (0)