From 56facb3e7ed1d5f3b8b990453a5599a0e56bb8cd Mon Sep 17 00:00:00 2001 From: JongChern Date: Mon, 10 Feb 2025 15:55:34 +0800 Subject: [PATCH 1/2] uprev --- .../ShimmerAndroidInstrumentDriver/build.gradle | 2 +- ShimmerAndroidInstrumentDriver/build.gradle | 4 ++-- .../shimmerBasicExample/build.gradle | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle index f10d0dbb..d9e08157 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle @@ -82,7 +82,7 @@ publishing { bar(MavenPublication) { groupId = 'com.shimmerresearch' // Replace with your package's group/organization name artifactId = 'shimmerandroidinstrumentdriver' // Replace with the name of your package - version = '3.0.86_beta' // Replace with your package version + version = '3.1.0_beta' // Replace with your package version artifact("$buildDir/outputs/aar/${getArtificatId()}-release.aar") } } diff --git a/ShimmerAndroidInstrumentDriver/build.gradle b/ShimmerAndroidInstrumentDriver/build.gradle index 6c8f3cba..44b021d4 100644 --- a/ShimmerAndroidInstrumentDriver/build.gradle +++ b/ShimmerAndroidInstrumentDriver/build.gradle @@ -78,7 +78,7 @@ allprojects { implementation 'java3d:vecmath:1.3.1' implementation 'com.android.support:appcompat-v7:26.1.0' implementation 'com.github.Jasonchenlijian:FastBle:2.4.0' - implementation (group: 'com.shimmerresearch', name: 'shimmerbluetoothmanagerdev', version:'0.10.27_alpha'){ + implementation (group: 'com.shimmerresearch', name: 'shimmerbluetoothmanager', version:'0.11.0_beta'){ // excluding org.json which is provided by Android exclude group: 'io.netty' @@ -86,7 +86,7 @@ allprojects { exclude group: 'org.apache.commons.math' } - implementation (group: 'com.shimmerresearch', name: 'shimmerdriverdev', version:'0.10.27_alpha'){ + implementation (group: 'com.shimmerresearch', name: 'shimmerdriver', version:'0.11.0_beta'){ // excluding org.json which is provided by Android exclude group: 'io.netty' diff --git a/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle b/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle index 27ca4062..7bb47a04 100644 --- a/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle +++ b/ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle @@ -50,7 +50,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.android.support:support-v4:+' androidTestImplementation 'com.android.support:support-annotations:25.3.1' - implementation(group: 'com.shimmerresearch', name: 'shimmerandroidinstrumentdriver', version: '3.0.87_alpha', ext: 'aar') + implementation(group: 'com.shimmerresearch', name: 'shimmerandroidinstrumentdriver', version: '3.1.0_beta', ext: 'aar') 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 469b974acbff6a84194cc36e1866ef12195e6cb4 Mon Sep 17 00:00:00 2001 From: JongChern Date: Mon, 10 Feb 2025 16:17:20 +0800 Subject: [PATCH 2/2] minor to follow format used in java api --- .../ShimmerAndroidInstrumentDriver/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle index d9e08157..5bad0fe6 100644 --- a/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle +++ b/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle @@ -93,8 +93,8 @@ publishing { 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 = project.findProperty('gpra.usr') - password = project.findProperty('gpra.key') + username = project.findProperty("gpr.user") ?: System.getenv("USERNAME") + password = project.findProperty("gpr.key") ?: System.getenv("TOKEN") } } }