Merge pull request #28 from ShimmerEngineering/JA-49_test

JA-49

Author: JongChern

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. 

ShimmerAndroidInstrumentDriver/.gitignore

@@ -34,4 +34,5 @@ local.properties
 .Spotlight-V100
 .Trashes
 ehthumbs.db
-Thumbs.db
+Thumbs.db
+/ShimmerAndroidInstrumentDriver/gradle.properties

ShimmerAndroidInstrumentDriver/.idea/gradle.xml

@@ -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 '[email protected]'
-                        }
-                    }
-                    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 = ''
-                }
-            }
-        }
-    }
-
-	
 }

ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/.idea/gradle.xml

@@ -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

ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle

@@ -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;
     }

ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/gradle/wrapper/gradle-wrapper.properties

@@ -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'