Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ apply plugin: 'com.android.library'
apply plugin: 'maven-publish'

android {
namespace 'com.shimmerresearch.androidinstrumentdriver'
compileSdkVersion 33

lintOptions {
Expand Down Expand Up @@ -106,6 +107,7 @@ dependencies {
implementation files('libs/ShimmerBiophysicalProcessingLibrary_Rev_0_11.jar')
implementation files('libs/AndroidBluetoothLibrary.jar')
api files('libs/androidplot-core-0.5.0-release.jar')
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.github.Jasonchenlijian:FastBle:2.4.0'
implementation 'androidx.documentfile:documentfile:1.0.1'
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 33
namespace 'com.shimmerresearch.bluetoothmanagerexample'
compileSdkVersion 34

compileOptions {
sourceCompatibility 1.8
Expand All @@ -11,8 +12,8 @@ android {
defaultConfig {
multiDexEnabled true
applicationId "com.shimmerresearch.bluetoothmanagerexample"
minSdkVersion 14
targetSdkVersion 33
minSdkVersion 21
targetSdkVersion 34
versionCode 1
versionName "1.0"

Expand Down Expand Up @@ -50,10 +51,10 @@ android {
dependencies {
implementation project(':ShimmerAndroidInstrumentDriver')
implementation fileTree(dir: 'libs', include: ['*.jar'])
androidTestImplementation ('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
testImplementation 'junit:junit:4.12'
implementation 'com.android.support:multidex:1.0.3'
implementation 'androidx.multidex:multidex:2.0.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
6 changes: 3 additions & 3 deletions ShimmerAndroidInstrumentDriver/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.40'
ext.kotlin_version = '1.9.23'
repositories {
google()
mavenCentral()
mavenLocal()
}
dependencies {
//classpath 'com.android.tools.build:gradle:3.5.4'
classpath 'com.android.tools.build:gradle:7.0.4' // Compatible with JDK 11
classpath "com.android.tools.build:gradle:8.2.2"
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')
Expand Down Expand Up @@ -76,7 +76,7 @@ allprojects {
dependencies {
implementation 'com.google.guava:guava:20.0'
implementation 'java3d:vecmath:1.3.1'
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.github.Jasonchenlijian:FastBle:2.4.0'
implementation (group: 'com.shimmerresearch', name: 'shimmerbluetoothmanager', version:'0.11.5_beta'){

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 33
namespace 'com.shimmerresearch.efficientdataarrayexample'
compileSdkVersion 34



defaultConfig {
applicationId "com.shimmerresearch.efficientdataarrayexample"
minSdkVersion 14
targetSdkVersion 33
minSdkVersion 21
targetSdkVersion 34
versionCode 1
versionName "1.0"
multiDexEnabled true
Expand Down Expand Up @@ -48,10 +49,13 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
androidTestImplementation 'com.android.support:support-annotations:25.3.1'
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
androidTestImplementation 'androidx.annotation:annotation:1.7.1'
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'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation 'androidx.documentfile:documentfile:1.0.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation project(path: ':ShimmerAndroidInstrumentDriver')
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip

Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ plugins {
}

android {
namespace 'shimmerresearch.com.multiverisenseblebasicexample'
//buildToolsVersion '23.0.1'
compileSdkVersion 33
compileSdkVersion 34

defaultConfig {
applicationId "shimmerresearch.com.multiverisenseblebasicexample"
minSdkVersion 14
targetSdkVersion 33
minSdkVersion 21
targetSdkVersion 34
versionCode 1
versionName "1.0"
multiDexEnabled true
Expand Down Expand Up @@ -47,16 +48,15 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(path: ':ShimmerAndroidInstrumentDriver')

androidTestImplementation 'com.android.support:support-annotations:25.3.1'
//compile(group: 'com.shimmersensing', name: 'ShimmerAndroidInstrumentDriver', version: '3.0.71Beta', ext: 'aar')
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
androidTestImplementation 'androidx.annotation:annotation:1.7.1'
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'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
testImplementation 'junit:junit:4.12'
implementation 'com.android.support:multidex:1.0.3'
implementation 'androidx.multidex:multidex:2.0.1'
}
repositories {
mavenCentral()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ plugins {
}

android {
compileSdkVersion 33
namespace 'shimmerresearch.com.shimmer3blebasicexample'
compileSdkVersion 34

defaultConfig {
applicationId "shimmerresearch.com.shimmer3blebasicexample"
minSdkVersion 17
targetSdkVersion 33
minSdkVersion 21
targetSdkVersion 34
versionCode 1
versionName "1.0"
multiDexEnabled true
Expand Down Expand Up @@ -45,10 +46,11 @@ android {

dependencies {
implementation project(path: ':ShimmerAndroidInstrumentDriver')

implementation 'com.android.support:support-annotations:25.3.1'
implementation 'com.android.support.constraint:constraint-layout:2.0.4'
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
implementation 'androidx.annotation:annotation:1.7.1'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
apply plugin: 'com.android.application'

android {
namespace 'com.shimmerresearch.shimmer3dexample'
// compileSdkVersion 23
compileSdkVersion 33
compileSdkVersion 34

defaultConfig {
applicationId "com.shimmerresearch.shimmer3dexample"
minSdkVersion 14
targetSdkVersion 33
minSdkVersion 21
targetSdkVersion 34
multiDexEnabled true
}

Expand Down Expand Up @@ -41,4 +42,6 @@ dependencies {
implementation files('../ShimmerAndroidInstrumentDriver/libs/ShimmerBiophysicalProcessingLibrary_Rev_0_11.jar')
implementation files('../ShimmerAndroidInstrumentDriver/libs/androidplot-core-0.5.0-release.jar')
implementation 'com.google.guava:guava:19.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
Original file line number Diff line number Diff line change
Expand Up @@ -288,30 +288,25 @@ public boolean onCreateOptionsMenu(Menu menu) {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
Intent serverIntent;
switch (item.getItemId()) {

case R.id.itemConnect:
int id = item.getItemId();
if(id == R.id.itemConnect){
serverIntent = new Intent(this, DeviceListActivity.class);
startActivityForResult(serverIntent, REQUEST_CONNECT_SHIMMER);

startActivityForResult(serverIntent, REQUEST_CONNECT_SHIMMER);
return true;

case R.id.itemDisconnect:
}else if(id == R.id.itemDisconnect){
mShimmerDevice1.stop();
return true;
case R.id.itemConfigure:
}else if(id == R.id.itemConfigure){
serverIntent = new Intent(this, ConfigureActivity.class);
serverIntent.putExtra("LowPowerMag",mShimmerDevice1.isLowPowerMagEnabled());
serverIntent.putExtra("GyroOnTheFlyCal",mShimmerDevice1.isGyroOnTheFlyCalEnabled());
startActivityForResult(serverIntent, REQUEST_CONFIGURE_SHIMMER);
return true;
default:
}else{
return super.onOptionsItemSelected(item);
}
}



public void onActivityResult(int requestCode, int resultCode, Intent data) {

switch (requestCode) {
Expand Down
19 changes: 11 additions & 8 deletions ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 33
namespace 'shimmerresearch.com.shimmerbasicexample'
compileSdkVersion 34



defaultConfig {
applicationId "shimmerresearch.com.shimmerbasicexample"
minSdkVersion 17
targetSdkVersion 33
minSdkVersion 21
targetSdkVersion 34
versionCode 1
versionName "1.0"
multiDexEnabled true
Expand Down Expand Up @@ -48,13 +49,15 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:support-v4:+'
androidTestImplementation 'com.android.support:support-annotations:25.3.1'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation(group: 'com.shimmerresearch', name: 'shimmerandroidinstrumentdriver', version: '3.2.2_beta', ext: 'aar')
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
androidTestImplementation 'androidx.annotation:annotation:1.7.1'
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'
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
repositories {
Expand Down
18 changes: 10 additions & 8 deletions ShimmerAndroidInstrumentDriver/shimmerConnectionTest/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 33
namespace 'shimmerresearch.com.shimmerconnectiontest'
compileSdkVersion 34



defaultConfig {
applicationId "shimmerresearch.com.shimmerconnectiontest"
minSdkVersion 17
targetSdkVersion 33
minSdkVersion 21
targetSdkVersion 34
versionCode 1
versionName "1.0"
multiDexEnabled true
Expand Down Expand Up @@ -48,14 +49,15 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

androidTestImplementation 'com.android.support:support-annotations:25.3.1'
androidTestImplementation 'androidx.annotation:annotation:1.7.1'
//compile(group: 'com.shimmersensing', name: 'ShimmerAndroidInstrumentDriver', version: '3.0.71Beta', ext: 'aar')
implementation project(':ShimmerAndroidInstrumentDriver')
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
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'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
repositories {
mavenCentral()
Expand Down
15 changes: 8 additions & 7 deletions ShimmerAndroidInstrumentDriver/shimmerLegacyExample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 33
namespace 'com.shimmerresearch.shimmerlegacyexample'
compileSdkVersion 34
buildToolsVersion '26.0.2'

defaultConfig {
applicationId "com.shimmerresearch.shimmerlegacyexample"
minSdkVersion 14
targetSdkVersion 33
minSdkVersion 21
targetSdkVersion 34
versionCode 1
versionName "1.0"
multiDexEnabled true
Expand Down Expand Up @@ -48,9 +49,9 @@ android {
dependencies {
implementation project(':ShimmerAndroidInstrumentDriver')
implementation fileTree(dir: 'libs', include: ['*.jar'])
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
testImplementation 'junit:junit:4.12'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<activity android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
Loading