aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-25 10:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7 from hrldcpr/better-dependency

Browse Source 
better way to depend on DFULibrary
This commit is contained in:
Aleksander Nowakowski
2015-07-14 10:01:33 +02:00
parent 71a332c7de cdd00eeab5
commit 28f153c11d
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/gradle.xml generated
View File

@@ -7,8 +7,6 @@
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$/.." />
<option value="$PROJECT_DIR$/../DFULibrary" />
<option value="$PROJECT_DIR$/../DFULibrary/dfu" />
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />

2
.idea/modules.xml generated
View File

@@ -2,8 +2,6 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/../...iml" filepath="$PROJECT_DIR$/../...iml" />
<module fileurl="file://$PROJECT_DIR$/../DFULibrary/DFULibrary.iml" filepath="$PROJECT_DIR$/../DFULibrary/DFULibrary.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/../DFULibrary/dfu/dfu.iml" filepath="$PROJECT_DIR$/../DFULibrary/dfu/dfu.iml" />
<module fileurl="file://$PROJECT_DIR$/nRFToolbox.iml" filepath="$PROJECT_DIR$/nRFToolbox.iml" />

2
app/build.gradle
View File

@@ -22,7 +22,7 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:22.2.0'
compile 'com.android.support:design:22.2.0'
compile project(':..:DFULibrary:dfu')
compile project(':dfu')
compile files('libs/achartengine-1.1.0.jar')
compile files('libs/nrf-logger-v2.0.jar')
}

5
settings.gradle
View File

@@ -1 +1,4 @@
include ':app', '..:DFULibrary:dfu'
include ':app'
include ':dfu'
project(':dfu').projectDir = file('../DFULibrary/dfu')