Skip to content

Commit 5a2a7b1

Browse files
JongChernJongChern
committed
uprev
1 parent eed4c87 commit 5a2a7b1

File tree

2 files changed

+12
-19
lines changed

2 files changed

+12
-19
lines changed

‎ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver-ShimmerAndroidInstrumentDriver.iml‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,38 +65,31 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7568
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7669
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7770
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
7871
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
7972
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8073
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8174
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8382
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8483
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8684
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8985
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
9086
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
9187
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
9288
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9389
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
9490
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
9591
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
9792
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
10093
</content>
10194
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
10295
<orderEntry type="sourceFolder" forTests="false" />
@@ -124,7 +117,6 @@
124117
<orderEntry type="library" exported="" name="JTransforms-3.1" level="project" />
125118
<orderEntry type="library" exported="" name="instrumentation-api-0.4.3" level="project" />
126119
<orderEntry type="library" exported="" name="proto-google-common-protos-0.1.9" level="project" />
127-
<orderEntry type="library" exported="" name="ShimmerDriver-0.9.18beta" level="project" />
128120
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
129121
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
130122
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
@@ -138,14 +130,15 @@
138130
<orderEntry type="library" exported="" name="commons-math3-3.6" level="project" />
139131
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
140132
<orderEntry type="library" exported="" name="AndroidBluetoothLibrary" level="project" />
133+
<orderEntry type="library" exported="" name="ShimmerDriver-0.9.20beta" level="project" />
141134
<orderEntry type="library" exported="" name="slf4j-api-1.7.21" level="project" />
142135
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
143136
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
144137
<orderEntry type="library" exported="" name="grpc-netty-1.6.1" level="project" />
145138
<orderEntry type="library" exported="" name="grpc-auth-1.6.1" level="project" />
146139
<orderEntry type="library" exported="" name="grpc-all-1.6.1" level="project" />
147-
<orderEntry type="library" exported="" name="ShimmerBluetoothManager-0.9.19beta" level="project" />
148140
<orderEntry type="library" exported="" name="jblas-1.2.4" level="project" />
141+
<orderEntry type="library" exported="" name="ShimmerBluetoothManager-0.9.21beta" level="project" />
149142
<orderEntry type="library" exported="" name="multidex-1.0.1" level="project" />
150143
<orderEntry type="library" exported="" name="google-auth-library-credentials-0.4.0" level="project" />
151144
<orderEntry type="library" exported="" name="commons-collections-3.2" level="project" />

‎ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apply plugin: 'com.github.dcendents.android-maven'
55
apply plugin: 'maven-publish'
66
apply plugin: 'com.jfrog.bintray'
77

8-
version = '3.0.35Beta'
8+
version = '3.0.36Beta'
99

1010
android {
1111
compileSdkVersion 25
@@ -89,13 +89,13 @@ dependencies {
8989
compile files('libs/AndroidBluetoothLibrary.jar')
9090
compile files('libs/androidplot-core-0.5.0-release.jar')
9191
//compile files('libs/ShimmerDriverML.jar')
92-
compile ('com.shimmerresearch.managers.bluetoothmanager:ShimmerBluetoothManager:0.9.19beta') {
92+
compile ('com.shimmerresearch.managers.bluetoothmanager:ShimmerBluetoothManager:0.9.21beta') {
9393
// excluding org.json which is provided by Android
9494
exclude group: 'io.netty'
9595
exclude group: 'com.google.protobuf'
9696
exclude group: 'org.apache.commons.math'
9797
}
98-
compile ('com.shimmerresearch.driver:ShimmerDriver:0.9.18beta') {
98+
compile ('com.shimmerresearch.driver:ShimmerDriver:0.9.20beta') {
9999
// excluding org.json which is provided by Android
100100
exclude group: 'io.netty'
101101
exclude group: 'com.google.protobuf'

0 commit comments

Comments
 (0)