diff --git a/app/build.gradle b/app/build.gradle index 7b211c2f..5ea6039e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,7 +29,6 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 } } - dependencies { implementation project(':common') implementation fileTree(dir: 'libs', include: ['*.jar']) @@ -50,15 +49,23 @@ dependencies { // The DFU Library is imported automatically from jcenter: implementation 'no.nordicsemi.android:dfu:1.6.1' - // if you desire to build the DFU Library, clone the https://github.com/NordicSemiconductor/Android-DFU-Library project into DFULibrary folder, - // add it as a module into the project structure and uncomment the following line (and also the according lines in the settings.gradle): + // if you desire to build the DFU Library, clone the + // https://github.com/NordicSemiconductor/Android-DFU-Library project into DFULibrary folder, + // add it as a module into the project structure and uncomment the following line + // (and also the according lines in the settings.gradle): // implementation project(':dfu') // Import the BLE Library + // The BLE Common Library depends on BLE Library. It is enough to include the first one. + // implementation 'no.nordicsemi.android:ble-common:2.0-alpha1' + // The BLE Common Library may be included from jcenter. If you want to modify the code, + // clone both projects from GitHub and replace the line above with the following + // (and also the according lines in the settings.gradle): implementation project(':ble-common') implementation('org.simpleframework:simple-xml:2.7.1') { exclude group: 'stax', module: 'stax-api' exclude group: 'xpp3', module: 'xpp3' } -} \ No newline at end of file +} + diff --git a/settings.gradle b/settings.gradle index 6b6a700d..7bceaf53 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,7 @@ include ':app', ':wear', ':common' +// Uncomment these lines if you want to import the BLE Library and BLE Common Library as a project, +// not from jcenter include ':ble', ':ble-common' project(':ble').projectDir = file('../Android-BLE-Library/ble') project(':ble-common').projectDir = file('../Android-BLE-Common-Library/ble-common')