Skip to content

Commit 2967699

Browse files
JongChernJongChern
authored
Merge pull request #101 from ShimmerEngineering/DEV-380
DEV-380 ShimmerCapture (Android) Google Play recommended actions
2 parents f868a0c + fea583d commit 2967699

File tree

19 files changed

+353
-319
lines changed

19 files changed

+353
-319
lines changed

‎ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ apply plugin: 'com.android.library'
55
apply plugin: 'maven-publish'
66

77
android {
8+
namespace 'com.shimmerresearch.androidinstrumentdriver'
89
compileSdkVersion 33
910

1011
lintOptions {
@@ -106,6 +107,7 @@ dependencies {
106107
implementation files('libs/ShimmerBiophysicalProcessingLibrary_Rev_0_11.jar')
107108
implementation files('libs/AndroidBluetoothLibrary.jar')
108109
api files('libs/androidplot-core-0.5.0-release.jar')
109-
implementation 'com.android.support:appcompat-v7:26.1.0'
110+
implementation 'androidx.appcompat:appcompat:1.7.0'
110111
implementation 'com.github.Jasonchenlijian:FastBle:2.4.0'
112+
implementation 'androidx.documentfile:documentfile:1.0.1'
111113
}

‎ShimmerAndroidInstrumentDriver/bluetoothManagerExample/build.gradle‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 33
4+
namespace 'com.shimmerresearch.bluetoothmanagerexample'
5+
compileSdkVersion 34
56

67
compileOptions {
78
sourceCompatibility 1.8
@@ -11,8 +12,8 @@ android {
1112
defaultConfig {
1213
multiDexEnabled true
1314
applicationId "com.shimmerresearch.bluetoothmanagerexample"
14-
minSdkVersion 14
15-
targetSdkVersion 33
15+
minSdkVersion 21
16+
targetSdkVersion 34
1617
versionCode 1
1718
versionName "1.0"
1819

@@ -50,10 +51,10 @@ android {
5051
dependencies {
5152
implementation project(':ShimmerAndroidInstrumentDriver')
5253
implementation fileTree(dir: 'libs', include: ['*.jar'])
53-
androidTestImplementation ('com.android.support.test.espresso:espresso-core:2.2.2', {
54-
exclude group: 'com.android.support', module: 'support-annotations'
55-
})
56-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
54+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
55+
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
5756
testImplementation 'junit:junit:4.12'
58-
implementation 'com.android.support:multidex:1.0.3'
57+
implementation 'androidx.multidex:multidex:2.0.1'
58+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
59+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
5960
}

‎ShimmerAndroidInstrumentDriver/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.3.40'
4+
ext.kotlin_version = '1.9.23'
55
repositories {
66
google()
77
mavenCentral()
88
mavenLocal()
99
}
1010
dependencies {
1111
//classpath 'com.android.tools.build:gradle:3.5.4'
12-
classpath 'com.android.tools.build:gradle:7.0.4' // Compatible with JDK 11
12+
classpath "com.android.tools.build:gradle:8.2.2"
1313
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1414
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1515
//classpath('org.jfrog.buildinfo:build-info-extractor-gradle:4.21.0')
@@ -76,7 +76,7 @@ allprojects {
7676
dependencies {
7777
implementation 'com.google.guava:guava:20.0'
7878
implementation 'java3d:vecmath:1.3.1'
79-
implementation 'com.android.support:appcompat-v7:26.1.0'
79+
implementation 'androidx.appcompat:appcompat:1.7.0'
8080
implementation 'com.github.Jasonchenlijian:FastBle:2.4.0'
8181
implementation (group: 'com.shimmerresearch', name: 'shimmerbluetoothmanager', version:'0.11.5_beta'){
8282

‎ShimmerAndroidInstrumentDriver/efficientDataArrayExample/build.gradle‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 33
4+
namespace 'com.shimmerresearch.efficientdataarrayexample'
5+
compileSdkVersion 34
56

67

78

89
defaultConfig {
910
applicationId "com.shimmerresearch.efficientdataarrayexample"
10-
minSdkVersion 14
11-
targetSdkVersion 33
11+
minSdkVersion 21
12+
targetSdkVersion 34
1213
versionCode 1
1314
versionName "1.0"
1415
multiDexEnabled true
@@ -48,10 +49,13 @@ android {
4849

4950
dependencies {
5051
implementation fileTree(dir: 'libs', include: ['*.jar'])
51-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
52-
androidTestImplementation 'com.android.support:support-annotations:25.3.1'
52+
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
53+
androidTestImplementation 'androidx.annotation:annotation:1.7.1'
5354
testImplementation 'junit:junit:4.12'
54-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
55-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
55+
androidTestImplementation 'androidx.test:runner:1.5.2'
56+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
57+
implementation 'androidx.documentfile:documentfile:1.0.1'
58+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
59+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
5660
implementation project(path: ':ShimmerAndroidInstrumentDriver')
5761
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
7+

‎ShimmerAndroidInstrumentDriver/multiverisenseblebasicexample/build.gradle‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ plugins {
33
}
44

55
android {
6+
namespace 'shimmerresearch.com.multiverisenseblebasicexample'
67
//buildToolsVersion '23.0.1'
7-
compileSdkVersion 33
8+
compileSdkVersion 34
89

910
defaultConfig {
1011
applicationId "shimmerresearch.com.multiverisenseblebasicexample"
11-
minSdkVersion 14
12-
targetSdkVersion 33
12+
minSdkVersion 21
13+
targetSdkVersion 34
1314
versionCode 1
1415
versionName "1.0"
1516
multiDexEnabled true
@@ -47,16 +48,15 @@ dependencies {
4748
implementation fileTree(dir: 'libs', include: ['*.jar'])
4849
implementation project(path: ':ShimmerAndroidInstrumentDriver')
4950

50-
androidTestImplementation 'com.android.support:support-annotations:25.3.1'
51-
//compile(group: 'com.shimmersensing', name: 'ShimmerAndroidInstrumentDriver', version: '3.0.71Beta', ext: 'aar')
52-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
51+
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
52+
androidTestImplementation 'androidx.annotation:annotation:1.7.1'
5353
testImplementation 'junit:junit:4.12'
54-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
55-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
56-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
57-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
54+
androidTestImplementation 'androidx.test:runner:1.5.2'
55+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
56+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
57+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
5858
testImplementation 'junit:junit:4.12'
59-
implementation 'com.android.support:multidex:1.0.3'
59+
implementation 'androidx.multidex:multidex:2.0.1'
6060
}
6161
repositories {
6262
mavenCentral()

‎ShimmerAndroidInstrumentDriver/shimmer3BLEBasicExample/build.gradle‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ plugins {
33
}
44

55
android {
6-
compileSdkVersion 33
6+
namespace 'shimmerresearch.com.shimmer3blebasicexample'
7+
compileSdkVersion 34
78

89
defaultConfig {
910
applicationId "shimmerresearch.com.shimmer3blebasicexample"
10-
minSdkVersion 17
11-
targetSdkVersion 33
11+
minSdkVersion 21
12+
targetSdkVersion 34
1213
versionCode 1
1314
versionName "1.0"
1415
multiDexEnabled true
@@ -45,10 +46,11 @@ android {
4546

4647
dependencies {
4748
implementation project(path: ':ShimmerAndroidInstrumentDriver')
48-
49-
implementation 'com.android.support:support-annotations:25.3.1'
50-
implementation 'com.android.support.constraint:constraint-layout:2.0.4'
49+
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
50+
implementation 'androidx.annotation:annotation:1.7.1'
5151
testImplementation 'junit:junit:4.13.2'
52-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
53-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
52+
androidTestImplementation 'androidx.test:runner:1.5.2'
53+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
54+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
55+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
5456
}

‎ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/build.gradle‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
android {
4+
namespace 'com.shimmerresearch.shimmer3dexample'
45
// compileSdkVersion 23
5-
compileSdkVersion 33
6+
compileSdkVersion 34
67

78
defaultConfig {
89
applicationId "com.shimmerresearch.shimmer3dexample"
9-
minSdkVersion 14
10-
targetSdkVersion 33
10+
minSdkVersion 21
11+
targetSdkVersion 34
1112
multiDexEnabled true
1213
}
1314

@@ -41,4 +42,6 @@ dependencies {
4142
implementation files('../ShimmerAndroidInstrumentDriver/libs/ShimmerBiophysicalProcessingLibrary_Rev_0_11.jar')
4243
implementation files('../ShimmerAndroidInstrumentDriver/libs/androidplot-core-0.5.0-release.jar')
4344
implementation 'com.google.guava:guava:19.0'
45+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
46+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
4447
}

‎ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/src/main/java/com/shimmerresearch/orientationexample/Shimmer3DOrientationExample.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -288,30 +288,25 @@ public boolean onCreateOptionsMenu(Menu menu) {
288288
@Override
289289
public boolean onOptionsItemSelected(MenuItem item) {
290290
Intent serverIntent;
291-
switch (item.getItemId()) {
292-
293-
case R.id.itemConnect:
291+
int id = item.getItemId();
292+
if(id == R.id.itemConnect){
294293
serverIntent = new Intent(this, DeviceListActivity.class);
295-
startActivityForResult(serverIntent, REQUEST_CONNECT_SHIMMER);
296-
294+
startActivityForResult(serverIntent, REQUEST_CONNECT_SHIMMER);
297295
return true;
298-
299-
case R.id.itemDisconnect:
296+
}else if(id == R.id.itemDisconnect){
300297
mShimmerDevice1.stop();
301298
return true;
302-
case R.id.itemConfigure:
299+
}else if(id == R.id.itemConfigure){
303300
serverIntent = new Intent(this, ConfigureActivity.class);
304301
serverIntent.putExtra("LowPowerMag",mShimmerDevice1.isLowPowerMagEnabled());
305302
serverIntent.putExtra("GyroOnTheFlyCal",mShimmerDevice1.isGyroOnTheFlyCalEnabled());
306303
startActivityForResult(serverIntent, REQUEST_CONFIGURE_SHIMMER);
307304
return true;
308-
default:
305+
}else{
309306
return super.onOptionsItemSelected(item);
310307
}
311308
}
312309

313-
314-
315310
public void onActivityResult(int requestCode, int resultCode, Intent data) {
316311

317312
switch (requestCode) {

‎ShimmerAndroidInstrumentDriver/shimmerBasicExample/build.gradle‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 33
4+
namespace 'shimmerresearch.com.shimmerbasicexample'
5+
compileSdkVersion 34
56

67

78

89
defaultConfig {
910
applicationId "shimmerresearch.com.shimmerbasicexample"
10-
minSdkVersion 17
11-
targetSdkVersion 33
11+
minSdkVersion 21
12+
targetSdkVersion 34
1213
versionCode 1
1314
versionName "1.0"
1415
multiDexEnabled true
@@ -48,13 +49,15 @@ android {
4849

4950
dependencies {
5051
implementation fileTree(dir: 'libs', include: ['*.jar'])
51-
implementation 'com.android.support:support-v4:+'
52-
androidTestImplementation 'com.android.support:support-annotations:25.3.1'
52+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
5353
implementation(group: 'com.shimmerresearch', name: 'shimmerandroidinstrumentdriver', version: '3.2.2_beta', ext: 'aar')
54-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
54+
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
55+
androidTestImplementation 'androidx.annotation:annotation:1.7.1'
5556
testImplementation 'junit:junit:4.12'
56-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
57-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
57+
androidTestImplementation 'androidx.test:runner:1.5.2'
58+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
59+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
60+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
5861
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
5962
}
6063
repositories {

0 commit comments

Comments
 (0)