AA-272

ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle

@@ -2,7 +2,7 @@
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.artifactory'
+//apply plugin: 'com.jfrog.artifactory'
 apply plugin: 'maven-publish'
 
 version = '3.0.72Beta'
@@ -56,6 +56,9 @@ android {
     }
 }
 
+
+
+/*
 publishing {
     artifactoryPublish.dependsOn('build')
     publications {
@@ -67,20 +70,47 @@ publishing {
         }
     }
 }
+*/
+
+def getArtificatId = { ->
+    return "ShimmerAndroidInstrumentDriver" // Replace with library name ID
+}
+publishing {
+    publications {
+        bar(MavenPublication) {
+            groupId = 'com.shimmerresearch' // Replace with your package's group/organization name
+            artifactId = 'shimmerandroidinstrumentdriver' // Replace with the name of your package
+            version = '3.1.0_alpha' // Replace with your package version
+            artifact("$buildDir/outputs/aar/${getArtificatId()}-release.aar")
+        }
+    }
+
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/ShimmerEngineering/ShimmerAndroidAPI")
+            credentials {
+                /**Create github.properties in root project folder file with gpra.usr=GITHUB_USER_ID  & gpra.key=PERSONAL_ACCESS_TOKEN**/
+                username = githubProperties['gpra.usr'] ?: System.getenv("GPRA_USER")
+                password = githubProperties['gpra.key'] ?: System.getenv("GPRA_API_KEY")
+            }
+        }
+    }
+}
 
 dependencies {
     compile 'com.google.guava:guava:20.0'
     compile 'java3d:vecmath:1.3.1'
     compile files('libs/ShimmerBiophysicalProcessingLibrary_Rev_0_11.jar')
     compile files('libs/AndroidBluetoothLibrary.jar')
     compile files('libs/androidplot-core-0.5.0-release.jar')
-    implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta'){
+    implementation (group: 'com.shimmerresearch', name: 'shimmerbluetoothmanager', version:'0.10.0_alpha'){
         // 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'){
+    implementation (group: 'com.shimmerresearch', name: 'shimmerdriver', version:'0.10.0_alpha'){
         // excluding org.json which is provided by Android
         exclude group: 'io.netty'
         exclude group: 'com.google.protobuf'

ShimmerAndroidInstrumentDriver/build.gradle

@@ -11,22 +11,37 @@ buildscript {
         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')
+        //classpath('org.jfrog.buildinfo:build-info-extractor-gradle:4.21.0')
     }
 }
 // Plugin used to upload authenticated files to BinTray through Gradle
-plugins {
+/*plugins {
     id "com.jfrog.artifactory" version "4.21.0"
 }
 apply plugin: 'com.jfrog.artifactory'
+*/
 apply plugin: 'maven-publish'
 
 allprojects {
     repositories {
         google()
         maven {
-            url  "https://shimmersensing.jfrog.io/artifactory/ShimmerAPI"
-
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/ShimmerEngineering/Shimmer-Java-Android-API")
+            credentials {
+                /**Create github.properties in root project folder file with gpr.usr=GITHUB_USER_ID  & gpr.key=PERSONAL_ACCESS_TOKEN**/
+                username = githubProperties['gpr.usr'] ?: System.getenv("GPR_USER")
+                password = githubProperties['gpr.key'] ?: System.getenv("GPR_API_KEY")
+            }
+        }
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/ShimmerEngineering/ShimmerAndroidAPI")
+            credentials {
+                /**Create github.properties in root project folder file with gpr.usr=GITHUB_USER_ID  & gpr.key=PERSONAL_ACCESS_TOKEN**/
+                username = githubProperties['gpr.usr'] ?: System.getenv("GPR_USER")
+                password = githubProperties['gpr.key'] ?: System.getenv("GPR_API_KEY")
+            }
         }
         mavenCentral()
         mavenLocal()
@@ -57,21 +72,3 @@ allprojects {
 //        }
 //    }
 }
-
-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)
-    }
-}

ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle

@@ -45,7 +45,20 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
      androidTestCompile 'com.android.support:support-annotations:25.3.1'
-    compile(group: 'com.shimmersensing', name: 'ShimmerAndroidInstrumentDriver', version: '3.0.72Beta', ext: 'aar')
+    compile(group: 'com.shimmerresearch', name: 'shimmerandroidinstrumentdriver', version: '3.1.0_alpha', ext: 'aar')
+
+    implementation (group: 'com.shimmerresearch', name: 'shimmerbluetoothmanager', version:'0.10.0_alpha'){
+        // 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.shimmerresearch', name: 'shimmerdriver', version:'0.10.0_alpha'){
+        // 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: 'ShimmerBluetoothManager', version:'0.9.42beta'){
 //        // excluding org.json which is provided by Android
 //        exclude group: 'io.netty'
@@ -58,13 +71,15 @@ dependencies {
 //        exclude group: 'com.google.protobuf'
 //        exclude group: 'org.apache.commons.math'
 //    }
-
+/*
     implementation (group: 'com.shimmersensing', name: 'ShimmerDriverDev', version:'JA-79 v0.1'){
         // 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'

ShimmerAndroidInstrumentDriver/shimmerBasicExample/src/main/java/shimmerresearch/com/shimmerbasicexample/MainActivity.java

@@ -148,7 +148,7 @@ public void handleMessage(Message msg) {
                         case CONNECTED:
                             if(shimmer.getFirmwareVersionCode() >= 8){
                                 if(!spinner.isEnabled()){
-                                    switch(shimmer.getBtCommsCrcModeIfFwSupported()) {
+                                    switch(shimmer.getCurrentBtCommsCrcMode()) {
                                         case OFF:
                                             spinner.setSelection(0);
                                             break;

ShimmerAndroidInstrumentDriver/shimmerServiceExample/build.gradle

@@ -41,13 +41,13 @@ android {
 
 dependencies {
     compile project(':ShimmerAndroidInstrumentDriver')
-    implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta'){
+    implementation (group: 'com.shimmerresearch', name: 'shimmerbluetoothmanager', version:'0.10.0_alpha'){
         // 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'){
+    implementation (group: 'com.shimmerresearch', name: 'shimmerdriver', version:'0.10.0_alpha'){
         // excluding org.json which is provided by Android
         exclude group: 'io.netty'
         exclude group: 'com.google.protobuf'