From a479d4a37f06c20e83f342b136bc8239fe0aef06 Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Tue, 15 Dec 2020 15:29:49 +0800 Subject: [PATCH 01/14] release new version of android API, with updates made for AA-245 in the basic driver --- .../ShimmerAndroidInstrumentDriver/build.gradle | 6 +++--- .../shimmerBasicExample/build.gradle | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle index d671d085..15f23273 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'maven-publish' apply plugin: 'com.jfrog.bintray' -version = '3.0.65Beta' +version = '3.0.66Beta_AA-245' android { compileSdkVersion 25 @@ -89,13 +89,13 @@ dependencies { 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') { + compile ('com.shimmerresearch.managers.bluetoothmanager:ShimmerBluetoothManager:0.9.40beta_AA-245') { // 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') { + compile ('com.shimmerresearch.driver:ShimmerDriver:0.9.136beta_AA-245') { // excluding org.json which is provided by Android exclude group: 'io.netty' exclude group: 'com.google.protobuf' diff --git a/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle b/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle index 1a511713..5085a4d9 100644 --- a/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle +++ b/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle @@ -46,7 +46,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //compile project(':ShimmerAndroidInstrumentDriver') - compile 'ShimmerAndroidInstrumentDriver:ShimmerAndroidInstrumentDriver:3.0.65Beta' + compile 'ShimmerAndroidInstrumentDriver:ShimmerAndroidInstrumentDriver:3.0.66Beta_AA-245' androidTestCompile 'com.android.support:support-annotations:25.3.1' implementation 'com.android.support.constraint:constraint-layout:1.0.2' From cfe6af287451a73b6b504df71320e2e5f96403f4 Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Mon, 22 Feb 2021 21:18:37 +0800 Subject: [PATCH 02/14] update for AA-246 --- .../ShimmerAndroidInstrumentDriver/build.gradle | 8 +++++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../shimmerBasicExample/build.gradle | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle index 15f23273..27e63428 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'maven-publish' apply plugin: 'com.jfrog.bintray' -version = '3.0.66Beta_AA-245' +version = '3.0.69Beta_AA-245_AA-246' android { compileSdkVersion 25 @@ -89,15 +89,17 @@ dependencies { 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.40beta_AA-245') { + compile ('com.shimmerresearch.managers.bluetoothmanager:ShimmerBluetoothManager:0.9.41beta_AA-245_AA-246') { // excluding org.json which is provided by Android exclude group: 'io.netty' + exclude group: 'io.grpc' exclude group: 'com.google.protobuf' exclude group: 'org.apache.commons.math' } - compile ('com.shimmerresearch.driver:ShimmerDriver:0.9.136beta_AA-245') { + compile ('com.shimmerresearch.driver:ShimmerDriver:0.9.137beta_AA-245_AA-246') { // excluding org.json which is provided by Android exclude group: 'io.netty' + exclude group: 'io.grpc' exclude group: 'com.google.protobuf' exclude group: 'org.apache.commons.math' } diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/gradle/wrapper/gradle-wrapper.properties b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/gradle/wrapper/gradle-wrapper.properties index 0e7e8bcc..04fea95c 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-4.4-all.zip diff --git a/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle b/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle index 5085a4d9..23f2c46e 100644 --- a/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle +++ b/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle @@ -46,7 +46,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //compile project(':ShimmerAndroidInstrumentDriver') - compile 'ShimmerAndroidInstrumentDriver:ShimmerAndroidInstrumentDriver:3.0.66Beta_AA-245' + compile 'ShimmerAndroidInstrumentDriver:ShimmerAndroidInstrumentDriver:3.0.69Beta_AA-245_AA-246' androidTestCompile 'com.android.support:support-annotations:25.3.1' implementation 'com.android.support.constraint:constraint-layout:1.0.2' From 1764dfc7cd8b5e7dcee7fbd0de69cd137b3c37b2 Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Tue, 18 May 2021 14:12:43 +0800 Subject: [PATCH 03/14] test branch for JFROG, switching shimmerbasicexample to using the project ShimmerAndroidInstrumentDriver for the time being --- ShimmerAndroidInstrumentDriver/.idea/gradle.xml | 3 +++ .../ShimmerAndroidInstrumentDriver/.idea/gradle.xml | 3 +++ .../ShimmerAndroidInstrumentDriver/build.gradle | 4 ++-- ShimmerAndroidInstrumentDriver/build.gradle | 3 ++- .../shimmerBasicExample/build.gradle | 4 ++-- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ShimmerAndroidInstrumentDriver/.idea/gradle.xml b/ShimmerAndroidInstrumentDriver/.idea/gradle.xml index 2571224f..777ede50 100644 --- a/ShimmerAndroidInstrumentDriver/.idea/gradle.xml +++ b/ShimmerAndroidInstrumentDriver/.idea/gradle.xml @@ -1,8 +1,10 @@ + 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 27e63428..24c56a6f 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle @@ -89,14 +89,14 @@ dependencies { 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.41beta_AA-245_AA-246') { + compile(group: 'com.shimmersensing', name: 'rmshimmerapi', version: '1.3') { // excluding org.json which is provided by Android exclude group: 'io.netty' exclude group: 'io.grpc' exclude group: 'com.google.protobuf' exclude group: 'org.apache.commons.math' } - compile ('com.shimmerresearch.driver:ShimmerDriver:0.9.137beta_AA-245_AA-246') { + compile(group: 'com.shimmersensing', name: 'rmshimmerbtmanager', version: '1.3') { // excluding org.json which is provided by Android exclude group: 'io.netty' exclude group: 'io.grpc' diff --git a/ShimmerAndroidInstrumentDriver/build.gradle b/ShimmerAndroidInstrumentDriver/build.gradle index af6baffd..a5c7b733 100644 --- a/ShimmerAndroidInstrumentDriver/build.gradle +++ b/ShimmerAndroidInstrumentDriver/build.gradle @@ -20,7 +20,8 @@ allprojects { google() jcenter() maven { - url "http://dl.bintray.com/shimmerengineering/Shimmer" + //url "http://dl.bintray.com/shimmerengineering/Shimmer" + url 'https://shimmersensing.jfrog.io/artifactory/dummyLcl' } } } diff --git a/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle b/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle index 23f2c46e..b41aaf08 100644 --- a/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle +++ b/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle @@ -46,9 +46,9 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) //compile project(':ShimmerAndroidInstrumentDriver') - compile 'ShimmerAndroidInstrumentDriver:ShimmerAndroidInstrumentDriver:3.0.69Beta_AA-245_AA-246' + //compile 'ShimmerAndroidInstrumentDriver:ShimmerAndroidInstrumentDriver:3.0.69Beta_AA-245_AA-246' androidTestCompile 'com.android.support:support-annotations:25.3.1' - + compile project(':ShimmerAndroidInstrumentDriver') implementation 'com.android.support.constraint:constraint-layout:1.0.2' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.1' From bad0d1ff21f4d5a17f6467b29dc90af7d4677fc4 Mon Sep 17 00:00:00 2001 From: JongChern Date: Tue, 18 May 2021 14:27:09 +0800 Subject: [PATCH 04/14] Update README.md --- README.md | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/README.md b/README.md index 9fcce388..7bf95ada 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,45 @@ +# Important ~ Migration to JFrog +With Bintray being sunset, we are currently in the process of moving to the use of JFrog. As a test, this is a preliminary branch of which you can use to test your applications. Please note this is not the final version as we will be doing more refactoring and updates that have long been scheduled. Should you face any problem please do not hesitate to contact us. Eventually the goal will be to have the master branch updated and using JFrog. We apologize for any inconvenience caused. + +It is important to note that for the time being the examples do not work directly with the aar library on JFrog, as such we recommend importing the ShimmerAndroidInstrumentDriver project as is currently done in all the examples we have provided. + +# JFrog Gradle Settings +The gradle file for the example ShimmerBasicExamples have been updated accordingly to the following:- + +repositories:- + +``` +maven { + url 'https://shimmersensing.jfrog.io/artifactory/dummyLcl' +} +``` +dependencies:- +``` +compile(group: 'com.shimmersensing', name: 'rmshimmerdriverpc', version: '1.3') +``` + +For further info +https://shimmersensing.jfrog.io/ui/repos/tree/General/dummyLcl%2Fcom%2Fshimmersensing%2Frmshimmerbtmanager%2F1.3%2Frmshimmerbtmanager-1.3.jar +https://shimmersensing.jfrog.io/ui/repos/tree/General/dummyLcl%2Fcom%2Fshimmersensing%2Frmshimmerapi%2F1.3%2Frmshimmerapi-1.3.jar + +*Note this is not functional yet with our examples* +https://shimmersensing.jfrog.io/ui/repos/tree/General/dummyLcl%2Fcom%2Fshimmersensing%2FShimmerAndroidInstrumentDriver%2F3.0.65Beta%2FShimmerAndroidInstrumentDriver-3.0.65Beta.aar + +# 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. From 2eae1e1a056a39760352f7ba521e3302c7d901a9 Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Tue, 18 May 2021 14:57:18 +0800 Subject: [PATCH 05/14] test branch for JFROG, switching shimmerbasicexample to using the project ShimmerAndroidInstrumentDriver for the time being --- .../shimmerBasicExample/build.gradle | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle b/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle index b41aaf08..d27e5d14 100644 --- a/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle +++ b/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle @@ -48,7 +48,22 @@ dependencies { //compile project(':ShimmerAndroidInstrumentDriver') //compile 'ShimmerAndroidInstrumentDriver:ShimmerAndroidInstrumentDriver:3.0.69Beta_AA-245_AA-246' androidTestCompile 'com.android.support:support-annotations:25.3.1' - compile project(':ShimmerAndroidInstrumentDriver') + //compile project(':ShimmerAndroidInstrumentDriver') + compile(group: 'com.shimmersensing', name: 'ShimmerAndroidInstrumentDriver', version: '3.0.65Beta', ext: 'aar') + compile(group: 'com.shimmersensing', name: 'rmshimmerapi', version: '1.3') { + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'io.grpc' + exclude group: 'com.google.protobuf' + exclude group: 'org.apache.commons.math' + } + compile(group: 'com.shimmersensing', name: 'rmshimmerbtmanager', version: '1.3') { + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'io.grpc' + 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' From 53a4835362a3eb29e3e8b14522403ebfcaf0f0f6 Mon Sep 17 00:00:00 2001 From: JongChern Date: Tue, 18 May 2021 15:01:19 +0800 Subject: [PATCH 06/14] Update README.md --- README.md | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7bf95ada..2f1430e7 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,8 @@ # Important ~ Migration to JFrog With Bintray being sunset, we are currently in the process of moving to the use of JFrog. As a test, this is a preliminary branch of which you can use to test your applications. Please note this is not the final version as we will be doing more refactoring and updates that have long been scheduled. Should you face any problem please do not hesitate to contact us. Eventually the goal will be to have the master branch updated and using JFrog. We apologize for any inconvenience caused. -It is important to note that for the time being the examples do not work directly with the aar library on JFrog, as such we recommend importing the ShimmerAndroidInstrumentDriver project as is currently done in all the examples we have provided. - # JFrog Gradle Settings -The gradle file for the example ShimmerBasicExamples have been updated accordingly to the following:- +The gradle file for the example ShimmerBasicExample has been updated accordingly to the following:- repositories:- @@ -15,7 +13,21 @@ maven { ``` dependencies:- ``` -compile(group: 'com.shimmersensing', name: 'rmshimmerdriverpc', version: '1.3') +compile(group: 'com.shimmersensing', name: 'ShimmerAndroidInstrumentDriver', version: '3.0.65Beta', ext: 'aar') +compile(group: 'com.shimmersensing', name: 'rmshimmerapi', version: '1.3') { + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'io.grpc' + exclude group: 'com.google.protobuf' + exclude group: 'org.apache.commons.math' +} +compile(group: 'com.shimmersensing', name: 'rmshimmerbtmanager', version: '1.3') { + // excluding org.json which is provided by Android + exclude group: 'io.netty' + exclude group: 'io.grpc' + exclude group: 'com.google.protobuf' + exclude group: 'org.apache.commons.math' +} ``` For further info From 496242ce7cdb743410f8cda647f70158c795b05c Mon Sep 17 00:00:00 2001 From: RuMolloy Date: Mon, 24 May 2021 17:26:21 +0100 Subject: [PATCH 07/14] JA-49 #time 30m committed changes to build.gradle files for JFrog support --- .../build.gradle | 173 ++---------------- ShimmerAndroidInstrumentDriver/build.gradle | 66 ++++++- 2 files changed, 73 insertions(+), 166 deletions(-) diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle index 24c56a6f..0136ef06 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.69Beta_AA-245_AA-246' +version = '3.0.65Beta' android { compileSdkVersion 25 @@ -56,169 +56,24 @@ 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'] - - - //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(group: 'com.shimmersensing', name: 'rmshimmerapi', version: '1.3') { - // excluding org.json which is provided by Android - exclude group: 'io.netty' - exclude group: 'io.grpc' - exclude group: 'com.google.protobuf' - exclude group: 'org.apache.commons.math' - } - compile(group: 'com.shimmersensing', name: 'rmshimmerbtmanager', version: '1.3') { - // excluding org.json which is provided by Android - exclude group: 'io.netty' - exclude group: 'io.grpc' - exclude group: 'com.google.protobuf' - exclude group: 'org.apache.commons.math' - } - //For fragments: + implementation group: 'com.shimmersensing', name: 'rmshimmerbtmanager', version:'1.3' 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/build.gradle b/ShimmerAndroidInstrumentDriver/build.gradle index a5c7b733..3a46aa8e 100644 --- a/ShimmerAndroidInstrumentDriver/build.gradle +++ b/ShimmerAndroidInstrumentDriver/build.gradle @@ -1,27 +1,79 @@ // 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.1' 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/dummyLcl' + url "https://shimmersensing.jfrog.io/artifactory/dummyLcl" + + } + mavenCentral() + mavenLocal() + } + artifactory { + contextUrl = "${artifactory_contextUrl}" + publish { + repository { + repoKey = 'dummyLcl' + username = "${artifactory_user}" + password = "${artifactory_password}" + maven = true + } + defaults { + publications('mavenJava') + } + publishBuildInfo = true + publishArtifacts = true + publishPom = true + } + resolve { + repository { + repoKey = 'dummyLcl' + 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() + //artifactId = 'rmandroidapi' + //version = '1.3' + artifact("$buildDir/outputs/aar/ShimmerAndroidInstrumentDriver}-release.aar") + } + } + } + + artifactoryPublish { + publications(publishing.publications.ShimmerAndroidInstrumentDriver) + } +} \ No newline at end of file From 417cf4c99d619511936e46f43a4359b3ed983d4d Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Tue, 25 May 2021 16:17:18 +0800 Subject: [PATCH 08/14] add gradle.properties file to git ignore --- ShimmerAndroidInstrumentDriver/.gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From 10f97379af3506e64b1673f173248e2e69fdf4a2 Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Fri, 28 May 2021 14:57:25 +0800 Subject: [PATCH 09/14] change to jfrog ShimmerAPI --- .../ShimmerAndroidInstrumentDriver/build.gradle | 4 ++-- ShimmerAndroidInstrumentDriver/build.gradle | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle index 0136ef06..3c3bc649 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.artifactory' apply plugin: 'maven-publish' -version = '3.0.65Beta' +version = '3.0.70Beta' android { compileSdkVersion 25 @@ -74,6 +74,6 @@ dependencies { 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: 'rmshimmerbtmanager', version:'1.3' + implementation group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta' compile 'com.android.support:appcompat-v7:25.3.1' } diff --git a/ShimmerAndroidInstrumentDriver/build.gradle b/ShimmerAndroidInstrumentDriver/build.gradle index 3a46aa8e..c9f51c62 100644 --- a/ShimmerAndroidInstrumentDriver/build.gradle +++ b/ShimmerAndroidInstrumentDriver/build.gradle @@ -25,7 +25,7 @@ allprojects { repositories { google() maven { - url "https://shimmersensing.jfrog.io/artifactory/dummyLcl" + url "https://shimmersensing.jfrog.io/artifactory/ShimmerAPI" } mavenCentral() @@ -35,7 +35,7 @@ allprojects { contextUrl = "${artifactory_contextUrl}" publish { repository { - repoKey = 'dummyLcl' + repoKey = 'ShimmerAPI' username = "${artifactory_user}" password = "${artifactory_password}" maven = true @@ -49,7 +49,7 @@ allprojects { } resolve { repository { - repoKey = 'dummyLcl' + repoKey = 'ShimmerAPI' username = "${artifactory_user}" password = "${artifactory_password}" maven = true @@ -66,8 +66,6 @@ project('ShimmerAndroidInstrumentDriver') { groupId = 'com.shimmersensing' version = project.version artifactId project.getName() - //artifactId = 'rmandroidapi' - //version = '1.3' artifact("$buildDir/outputs/aar/ShimmerAndroidInstrumentDriver}-release.aar") } } From 267b8c36b3df49a9ae63f7ad0b5aea6712a02e73 Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Fri, 28 May 2021 15:54:12 +0800 Subject: [PATCH 10/14] minor fix --- .../manager/ShimmerBluetoothManagerAndroid.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) 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; } From 22cd566063f6262e6141b695c531549522533111 Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Mon, 31 May 2021 23:44:17 +0800 Subject: [PATCH 11/14] update to jfrog --- ShimmerAndroidInstrumentDriver/.idea/gradle.xml | 1 + .../ShimmerAndroidInstrumentDriver/build.gradle | 13 ++++++++++++- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../bluetoothManagerExample/build.gradle | 12 ++++++++++++ ShimmerAndroidInstrumentDriver/build.gradle | 2 +- .../efficientDataArrayExample/build.gradle | 12 ++++++++++++ .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../shimmer3DOrientationExample/Readme.md | 6 ++++-- .../shimmer3DOrientationExample/build.gradle | 12 ++++++++++++ .../Shimmer3DOrientationExample.java | 6 +++--- .../shimmerBasicExample/build.gradle | 11 ++++------- .../shimmerLegacyExample/build.gradle | 12 ++++++++++++ .../shimmerServiceExample/build.gradle | 12 ++++++++++++ 13 files changed, 88 insertions(+), 17 deletions(-) diff --git a/ShimmerAndroidInstrumentDriver/.idea/gradle.xml b/ShimmerAndroidInstrumentDriver/.idea/gradle.xml index 777ede50..167b8ae3 100644 --- a/ShimmerAndroidInstrumentDriver/.idea/gradle.xml +++ b/ShimmerAndroidInstrumentDriver/.idea/gradle.xml @@ -7,6 +7,7 @@