Skip to content

Commit 28f153c

Browse files
committed
Merge pull request NordicSemiconductor#7 from hrldcpr/better-dependency
better way to depend on DFULibrary
2 parents 71a332c + cdd00ee commit 28f153c

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

.idea/gradle.xml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222
compile fileTree(dir: 'libs', include: ['*.jar'])
2323
compile 'com.android.support:appcompat-v7:22.2.0'
2424
compile 'com.android.support:design:22.2.0'
25-
compile project(':..:DFULibrary:dfu')
25+
compile project(':dfu')
2626
compile files('libs/achartengine-1.1.0.jar')
2727
compile files('libs/nrf-logger-v2.0.jar')
2828
}

settings.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
include ':app', '..:DFULibrary:dfu'
1+
include ':app'
2+
3+
include ':dfu'
4+
project(':dfu').projectDir = file('../DFULibrary/dfu')

0 commit comments

Comments
 (0)