aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-21 16:34:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Gradle prepared to use libs from jcenter

Browse Source
This commit is contained in:
Aleksander Nowakowski
2018-06-19 15:19:59 +02:00
parent 728e264ee3
commit fd9f358179
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/build.gradle
View File

@@ -29,7 +29,6 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
} }
} }
dependencies { dependencies {
implementation project(':common') implementation project(':common')
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
@@ -50,15 +49,23 @@ dependencies {
// The DFU Library is imported automatically from jcenter: // The DFU Library is imported automatically from jcenter:
implementation 'no.nordicsemi.android:dfu:1.6.1' 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, // if you desire to build the DFU Library, clone the
// add it as a module into the project structure and uncomment the following line (and also the according lines in the settings.gradle): // 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') // implementation project(':dfu')
// Import the BLE Library // 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 project(':ble-common')
implementation('org.simpleframework:simple-xml:2.7.1') { implementation('org.simpleframework:simple-xml:2.7.1') {
exclude group: 'stax', module: 'stax-api' exclude group: 'stax', module: 'stax-api'
exclude group: 'xpp3', module: 'xpp3' exclude group: 'xpp3', module: 'xpp3'
} }
} }

2
settings.gradle
View File

@@ -1,5 +1,7 @@
include ':app', ':wear', ':common' 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' include ':ble', ':ble-common'
project(':ble').projectDir = file('../Android-BLE-Library/ble') project(':ble').projectDir = file('../Android-BLE-Library/ble')
project(':ble-common').projectDir = file('../Android-BLE-Common-Library/ble-common') project(':ble-common').projectDir = file('../Android-BLE-Common-Library/ble-common')