diff --git a/README.md b/README.md index 9fcce388..1d6ab009 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,53 @@ +# Important ~ Migration to JFrog +With Bintray being sunset, we have migrated to the use of JFrog. Should you face any problems please do not hesitate to contact us. We apologize for any inconvenience caused. + +# JFrog Gradle Settings +The gradle file for the example ShimmerBasicExample has been updated accordingly to the following:- + +repositories:- + +``` +maven { + url 'https://shimmersensing.jfrog.io/artifactory/ShimmerAPI' +} +``` +dependencies:- +``` +compile(group: 'com.shimmersensing', name: 'ShimmerAndroidInstrumentDriver', version: '3.0.70Beta', ext: 'aar') +implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta'){ + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'com.google.protobuf' + exclude group: 'org.apache.commons.math' +} +implementation (group: 'com.shimmersensing', name: 'ShimmerDriver', version:'0.9.138beta'){ + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'com.google.protobuf' + exclude group: 'org.apache.commons.math' +} +``` + +For further info +https://shimmersensing.jfrog.io/ui/repos/tree/General/ShimmerAPI%2Fcom%2Fshimmersensing%2FShimmerBluetoothManager +https://shimmersensing.jfrog.io/ui/repos/tree/General/ShimmerAPI%2Fcom%2Fshimmersensing%2FShimmerDriver +https://shimmersensing.jfrog.io/ui/repos/tree/General/ShimmerAPI%2Fcom%2Fshimmersensing%2FShimmerAndroidInstrumentDriver + +# Bintray Sunset +The following ways of getting the library is **deprecated** +repositories:- + +``` + maven { + url "http://dl.bintray.com/shimmerengineering/Shimmer" + } +``` +dependencies:- +``` +compile 'ShimmerAndroidInstrumentDriver:ShimmerAndroidInstrumentDriver:3.0.69Beta_AA-245_AA-246' +``` + + # ShimmerAndroidAPI 3.0Beta The Shimmer Android API is currently in a BETA development state, users are free to use and provide feedback. diff --git a/ShimmerAndroidInstrumentDriver/.gitignore b/ShimmerAndroidInstrumentDriver/.gitignore index f1ec5d75..ecc2fdb4 100644 --- a/ShimmerAndroidInstrumentDriver/.gitignore +++ b/ShimmerAndroidInstrumentDriver/.gitignore @@ -34,4 +34,5 @@ local.properties .Spotlight-V100 .Trashes ehthumbs.db -Thumbs.db \ No newline at end of file +Thumbs.db +/ShimmerAndroidInstrumentDriver/gradle.properties diff --git a/ShimmerAndroidInstrumentDriver/.idea/gradle.xml b/ShimmerAndroidInstrumentDriver/.idea/gradle.xml index 2571224f..167b8ae3 100644 --- a/ShimmerAndroidInstrumentDriver/.idea/gradle.xml +++ b/ShimmerAndroidInstrumentDriver/.idea/gradle.xml @@ -1,10 +1,13 @@ + diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/.idea/gradle.xml b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/.idea/gradle.xml index fc45e9ed..0b0517fb 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/.idea/gradle.xml +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/.idea/gradle.xml @@ -1,8 +1,10 @@ + diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle index 8d02d493..1482438d 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle @@ -2,10 +2,10 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' +apply plugin: 'com.jfrog.artifactory' apply plugin: 'maven-publish' -apply plugin: 'com.jfrog.bintray' -version = '3.0.65Beta' +version = '3.0.70Beta' android { compileSdkVersion 25 @@ -19,7 +19,6 @@ android { multiDexEnabled true minSdkVersion 14 targetSdkVersion 14 - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { @@ -57,169 +56,35 @@ android { } } -//repositories { -// mavenCentral() -// maven { -// url "http://192.168.0.139:8081/artifactory/libs-release-local" -// credentials { -// username = "alex" -// password = "AP5DYAtHgg8mmK4Tnrx6RyrniF6" -// } -// } -// flatDir { -// dirs 'libs' -// } -//} +publishing { + artifactoryPublish.dependsOn('build') + publications { + mavenJava(MavenPublication) { + groupId = 'com.shimmersensing' + version = project.version + artifactId project.getName() + artifact("$buildDir/outputs/aar/${project.getName()}-release.aar") + } + } +} dependencies { - //compile 'com.shimmerresearch:shimmerDriver:0.3.3' -// compile 'org.apache.commons:commons-lang3:3.4' -// compile 'org.apache.commons:commons-math3:3.6' -// compile 'org.apache.commons:commons-math:2.2' compile 'com.google.guava:guava:20.0' compile 'java3d:vecmath:1.3.1' -// compile 'commons-collections:commons-collections:3.2' - - //compile 'io.grpc:grpc-okhttp:1.0.0-pre1' - //compile 'io.grpc:grpc-protobuf-lite:1.0.0-pre1' - //compile 'io.grpc:grpc-stub:1.0.0-pre1'] - - testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.1' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' - //compile fileTree(include: ['*.jar'], dir: 'libs') compile files('libs/ShimmerBiophysicalProcessingLibrary_Rev_0_11.jar') compile files('libs/AndroidBluetoothLibrary.jar') compile files('libs/androidplot-core-0.5.0-release.jar') - //compile files('libs/ShimmerDriverML.jar') - compile ('com.shimmerresearch.managers.bluetoothmanager:ShimmerBluetoothManager:0.9.33beta') { + implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta'){ // excluding org.json which is provided by Android exclude group: 'io.netty' exclude group: 'com.google.protobuf' exclude group: 'org.apache.commons.math' - } - compile ('com.shimmerresearch.driver:ShimmerDriver:0.9.120beta') { + } + implementation (group: 'com.shimmersensing', name: 'ShimmerDriver', version:'0.9.138beta'){ // excluding org.json which is provided by Android exclude group: 'io.netty' exclude group: 'com.google.protobuf' exclude group: 'org.apache.commons.math' } - //For fragments: compile 'com.android.support:appcompat-v7:25.3.1' - - -/* - install { - repositories.mavenInstaller { - // This generates POM.xml with proper parameters - pom { - project { - packaging 'aar' - groupId 'com.shimmerresearch.android' - artifactId 'com.shimmerresearch.android' - - // Add your description here - name '' - description '' - url '' - - // Set your license - licenses { - license { - name 'MIT License' - url 'https://opensource.org/licenses/MIT' - } - } - developers { - developer { - id 'stefanosiano' - name 'Stefano Siano' - email 'stefano.siano91@gmail.com' - } - } - scm { - connection '' - developerConnection '' - url '' - - } - } - } - } - } -*/ - - - - - if (project.hasProperty("android")) { // Android libraries - task sourcesJar(type: Jar) { - classifier = 'sources' - from android.sourceSets.main.java.srcDirs - } - - task javadoc(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - } - } else { // Java libraries - task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource - } - } - - task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir - } - - artifacts { - archives sourcesJar - } - - publishing{ - publications { - maven(MavenPublication) { - groupId 'com.shimmerresearch.android' - version = project.version - artifactId project.getName() - artifact("$buildDir/outputs/aar/${project.getName()}-release.aar") - } - } - } - -// https://github.com/bintray/gradle-bintray-plugin - File file = new File(rootProject.getProjectDir().getAbsolutePath() + '/gradle.properties') - if(file.exists()) { - bintray { - user = shimmer_bintray_username - //this usually comes from gradle.properties file in ~/.gradle - key = shimmer_bintray_api_key - //this usually comes from gradle.properties file in ~/.gradle - - configurations = ['archives'] - - // Package info for BinTray - pkg { - repo = 'Shimmer' - // it is the name that appears in bintray when logged - name = 'shimmerandroiddriver' - desc = '' - websiteUrl = '' - vcsUrl = 'https://github.com/ShimmerEngineering/ShimmerAndroidAPI' - licenses = ['MIT'] - publish = true - publicDownloadNumbers = true - version { - name = project.version - desc = '' - released = new Date() - vcsTag = '' - } - } - } - } - - } diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/gradle/wrapper/gradle-wrapper.properties b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/gradle/wrapper/gradle-wrapper.properties index 0e7e8bcc..8d29cdfb 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/gradle/wrapper/gradle-wrapper.properties +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/manager/ShimmerBluetoothManagerAndroid.java b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/manager/ShimmerBluetoothManagerAndroid.java index 98bce59c..3016d182 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/manager/ShimmerBluetoothManagerAndroid.java +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/src/main/java/com/shimmerresearch/android/manager/ShimmerBluetoothManagerAndroid.java @@ -230,11 +230,16 @@ protected ShimmerDevice createNewShimmer3(ShimmerRadioInitializer shimmerRadioIn Shimmer shimmer = new Shimmer(mHandler); shimmer.setDelayForBtRespone(true); mMapOfBtConnectedShimmers.put(bluetoothAddress, shimmer); - ShimmerVerObject sVO = shimmerRadioInitializer.readShimmerVerObject(); - if (sVO.isShimmerGen3()){ - return initializeShimmer3(serialPort, shimmer); - } else if(sVO.isShimmerGen2()) { - return initializeShimmer2r(serialPort, shimmer); + try { + ShimmerVerObject sVO = shimmerRadioInitializer.readShimmerVerObject(); + if (sVO.isShimmerGen3()) { + return initializeShimmer3(serialPort, shimmer); + } else if (sVO.isShimmerGen2()) { + return initializeShimmer2r(serialPort, shimmer); + } + } catch (Exception ex){ + ex.printStackTrace(); + return null; } return null; } diff --git a/ShimmerAndroidInstrumentDriver/bluetoothManagerExample/build.gradle b/ShimmerAndroidInstrumentDriver/bluetoothManagerExample/build.gradle index 6c08cc9a..28437c45 100644 --- a/ShimmerAndroidInstrumentDriver/bluetoothManagerExample/build.gradle +++ b/ShimmerAndroidInstrumentDriver/bluetoothManagerExample/build.gradle @@ -44,6 +44,18 @@ android { dependencies { compile project(':ShimmerAndroidInstrumentDriver') + implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta'){ + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'com.google.protobuf' + exclude group: 'org.apache.commons.math' + } + implementation (group: 'com.shimmersensing', name: 'ShimmerDriver', version:'0.9.138beta'){ + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'com.google.protobuf' + exclude group: 'org.apache.commons.math' + } compile fileTree(dir: 'libs', include: ['*.jar']) androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' diff --git a/ShimmerAndroidInstrumentDriver/build.gradle b/ShimmerAndroidInstrumentDriver/build.gradle index af6baffd..c81d76c5 100644 --- a/ShimmerAndroidInstrumentDriver/build.gradle +++ b/ShimmerAndroidInstrumentDriver/build.gradle @@ -1,26 +1,77 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. + buildscript { - ext.kotlin_version = '1.2.30' + ext.kotlin_version = '1.3.10' repositories { google() - jcenter() + mavenCentral() + mavenLocal() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.5.4' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath('org.jfrog.buildinfo:build-info-extractor-gradle:4.21.0') } } // Plugin used to upload authenticated files to BinTray through Gradle plugins { - id "com.jfrog.bintray" version "1.7.3" + id "com.jfrog.artifactory" version "4.21.0" } +apply plugin: 'com.jfrog.artifactory' +apply plugin: 'maven-publish' + allprojects { repositories { google() - jcenter() maven { - url "http://dl.bintray.com/shimmerengineering/Shimmer" + url "https://shimmersensing.jfrog.io/artifactory/ShimmerAPI" + + } + mavenCentral() + mavenLocal() + } + artifactory { + contextUrl = "${artifactory_contextUrl}" + publish { + repository { + repoKey = 'ShimmerAPI' + username = "${artifactory_user}" + password = "${artifactory_password}" + maven = true + } + defaults { + publications('mavenJava') + } + publishBuildInfo = true + publishArtifacts = true + publishPom = true + } + resolve { + repository { + repoKey = 'ShimmerAPI' + username = "${artifactory_user}" + password = "${artifactory_password}" + maven = true + } } } } + +project('ShimmerAndroidInstrumentDriver') { + artifactoryPublish.dependsOn('build') + publishing { + publications { + ShimmerAndroidInstrumentDriver(MavenPublication) { + groupId = 'com.shimmersensing' + version = project.version + artifactId project.getName() + artifact("$buildDir/outputs/aar/ShimmerAndroidInstrumentDriver}-release.aar") + } + } + } + + artifactoryPublish { + publications(publishing.publications.ShimmerAndroidInstrumentDriver) + } +} \ No newline at end of file diff --git a/ShimmerAndroidInstrumentDriver/efficientDataArrayExample/build.gradle b/ShimmerAndroidInstrumentDriver/efficientDataArrayExample/build.gradle index 437d39f5..8acd8a36 100644 --- a/ShimmerAndroidInstrumentDriver/efficientDataArrayExample/build.gradle +++ b/ShimmerAndroidInstrumentDriver/efficientDataArrayExample/build.gradle @@ -50,4 +50,16 @@ dependencies { androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' compile project(path: ':ShimmerAndroidInstrumentDriver') + implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta'){ + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'com.google.protobuf' + exclude group: 'org.apache.commons.math' + } + implementation (group: 'com.shimmersensing', name: 'ShimmerDriver', version:'0.9.138beta'){ + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'com.google.protobuf' + exclude group: 'org.apache.commons.math' + } } diff --git a/ShimmerAndroidInstrumentDriver/gradle/wrapper/gradle-wrapper.properties b/ShimmerAndroidInstrumentDriver/gradle/wrapper/gradle-wrapper.properties index c43a20e4..64741c67 100644 --- a/ShimmerAndroidInstrumentDriver/gradle/wrapper/gradle-wrapper.properties +++ b/ShimmerAndroidInstrumentDriver/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Dec 28 12:40:36 SGT 2017 +#Mon May 31 23:08:15 SGT 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip diff --git a/ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/Readme.md b/ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/Readme.md index 6582e08d..8192135d 100644 --- a/ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/Readme.md +++ b/ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/Readme.md @@ -1,8 +1,10 @@ # Shimmer3DOrientationExample This example uses the Accelerometer, Gyroscope and Magnetometer to calculate orientation. Prior to using this example, calibrating the Shimmer3 Device using 9DoF Calibration (http://www.shimmersensing.com/support/wireless-sensor-networks-download) is recommended. - - +The following sensors should be calibrated +- Low Noise Accel +- Gyroscope at 500dps +- Magnetometer Known issues:- - Magnetometer is fixed to a low data rate, and should be increased to improve accuracy and responsiveness of the orientation algorithm diff --git a/ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/build.gradle b/ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/build.gradle index 8efd9017..b3883d96 100644 --- a/ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/build.gradle +++ b/ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/build.gradle @@ -31,6 +31,18 @@ android { dependencies { compile project(':ShimmerAndroidInstrumentDriver') + implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta'){ + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'com.google.protobuf' + exclude group: 'org.apache.commons.math' + } + implementation (group: 'com.shimmersensing', name: 'ShimmerDriver', version:'0.9.138beta'){ + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'com.google.protobuf' + exclude group: 'org.apache.commons.math' + } compile 'org.apache.commons:commons-math:2.2' compile 'org.apache.commons:commons-lang3:3.4' provided files('../ShimmerAndroidInstrumentDriver/libs/ShimmerBiophysicalProcessingLibrary_Rev_0_11.jar') diff --git a/ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/src/main/java/com/shimmerresearch/orientationexample/Shimmer3DOrientationExample.java b/ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/src/main/java/com/shimmerresearch/orientationexample/Shimmer3DOrientationExample.java index e339be37..50c2737d 100644 --- a/ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/src/main/java/com/shimmerresearch/orientationexample/Shimmer3DOrientationExample.java +++ b/ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/src/main/java/com/shimmerresearch/orientationexample/Shimmer3DOrientationExample.java @@ -82,9 +82,9 @@ protected void onCreate(Bundle savedInstanceState) { fm3d = new Matrix3d(); m3d = new Matrix3d(); invm3d.setIdentity(); - mShimmerDevice1 = new Shimmer(this, mHandler,"RightArm", 51.2, 0, 0, Shimmer.SENSOR_ACCEL|Shimmer.SENSOR_GYRO|Shimmer.SENSOR_MAG, false); - //mShimmerDevice1.enableOnTheFlyGyroCal(true, 102, 1.2); - mShimmerDevice1.enable3DOrientation(true); + Integer[] arraySensorID ={Configuration.Shimmer3.SENSOR_ID.SHIMMER_ANALOG_ACCEL,Configuration.Shimmer3.SENSOR_ID.SHIMMER_MPU9X50_GYRO,Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM303_MAG}; + // TODO Auto-generated method stub + mShimmerDevice1 = new Shimmer(mHandler,"test",51.2,1, 4, arraySensorID, 1, 0, 1, 0); buttonReset.setOnClickListener(new OnClickListener(){ public void onClick(View arg0) { diff --git a/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle b/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle index 1a511713..e883bc21 100644 --- a/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle +++ b/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' android { compileSdkVersion 26 @@ -45,15 +44,25 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - //compile project(':ShimmerAndroidInstrumentDriver') - compile 'ShimmerAndroidInstrumentDriver:ShimmerAndroidInstrumentDriver:3.0.65Beta' - androidTestCompile 'com.android.support:support-annotations:25.3.1' - + androidTestCompile 'com.android.support:support-annotations:25.3.1' + compile(group: 'com.shimmersensing', name: 'ShimmerAndroidInstrumentDriver', version: '3.0.70Beta', ext: 'aar') + implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta'){ + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'com.google.protobuf' + exclude group: 'org.apache.commons.math' + } + implementation (group: 'com.shimmersensing', name: 'ShimmerDriver', version:'0.9.138beta'){ + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'com.google.protobuf' + exclude group: 'org.apache.commons.math' + } implementation 'com.android.support.constraint:constraint-layout:1.0.2' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' - compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } repositories { mavenCentral() diff --git a/ShimmerAndroidInstrumentDriver/shimmerLegacyExample/build.gradle b/ShimmerAndroidInstrumentDriver/shimmerLegacyExample/build.gradle index 0deb395f..ea45fb45 100644 --- a/ShimmerAndroidInstrumentDriver/shimmerLegacyExample/build.gradle +++ b/ShimmerAndroidInstrumentDriver/shimmerLegacyExample/build.gradle @@ -42,6 +42,18 @@ android { dependencies { compile project(':ShimmerAndroidInstrumentDriver') + implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta'){ + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'com.google.protobuf' + exclude group: 'org.apache.commons.math' + } + implementation (group: 'com.shimmersensing', name: 'ShimmerDriver', version:'0.9.138beta'){ + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'com.google.protobuf' + exclude group: 'org.apache.commons.math' + } compile fileTree(dir: 'libs', include: ['*.jar']) androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' diff --git a/ShimmerAndroidInstrumentDriver/shimmerServiceExample/build.gradle b/ShimmerAndroidInstrumentDriver/shimmerServiceExample/build.gradle index 01d92027..86c12c99 100644 --- a/ShimmerAndroidInstrumentDriver/shimmerServiceExample/build.gradle +++ b/ShimmerAndroidInstrumentDriver/shimmerServiceExample/build.gradle @@ -41,6 +41,18 @@ android { dependencies { compile project(':ShimmerAndroidInstrumentDriver') + implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta'){ + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'com.google.protobuf' + exclude group: 'org.apache.commons.math' + } + implementation (group: 'com.shimmersensing', name: 'ShimmerDriver', version:'0.9.138beta'){ + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'com.google.protobuf' + exclude group: 'org.apache.commons.math' + } compile fileTree(dir: 'libs', include: ['*.jar']) androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations'