Skip to content

Commit ad545f4

Browse files
scaryghostscaryghost
committed
Update source code to api v2.6.5
1 parent 04f6624 commit ad545f4

File tree

8 files changed

+91
-47
lines changed

8 files changed

+91
-47
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Then, add the compile element to the dependencies closure in the module's *build
2020

2121
```gradle
2222
dependencies {
23-
compile 'com.mbientlab:metawear:2.6.0'
23+
compile 'com.mbientlab:metawear:2.6.5'
2424
}
2525
```
2626

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.2'
8+
classpath 'com.android.tools.build:gradle:2.2.1'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

‎example/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
apply plugin: 'com.android.application'
2626

2727
android {
28-
compileSdkVersion 23
29-
buildToolsVersion "23.0.2"
28+
compileSdkVersion 24
29+
buildToolsVersion "24.0.2"
3030
defaultConfig {
31-
applicationId 'com.mbientlab.metawear.test'
31+
applicationId 'com.mbientlab.metawear.example'
3232
minSdkVersion 18
33-
targetSdkVersion 23
33+
targetSdkVersion 24
3434
versionCode 1
3535
versionName "1.0"
3636
}
@@ -47,5 +47,5 @@ android {
4747
dependencies {
4848
compile fileTree(dir: 'libs', include: ['*.jar'])
4949
compile project(':library')
50-
compile 'com.android.support:appcompat-v7:23.4.0'
50+
compile 'com.android.support:appcompat-v7:24.2.1'
5151
}

‎example/example.iml‎

Lines changed: 57 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1715
<afterSyncTasks>
18-
<task>generateDebugAndroidTestSources</task>
1916
<task>generateDebugSources</task>
2017
</afterSyncTasks>
2118
<option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,19 +25,21 @@
2825
</component>
2926
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3027
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
31-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3229
<exclude-output />
3330
<content url="file://$MODULE_DIR$">
3431
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3532
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3633
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3734
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3836
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3937
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
4038
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4139
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4240
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4341
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4443
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4544
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4645
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -50,49 +49,86 @@
5049
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5150
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5251
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5361
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5462
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5563
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5664
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5765
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5866
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5967
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
6069
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6170
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6271
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6372
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6473
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6574
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6675
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
6785
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
6988
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
7189
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
72-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.1/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.2.1/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.1/jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/24.2.1/jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/24.2.1/jars" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/24.2.1/jars" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/24.2.1/jars" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.1/jars" />
7699
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
81107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
85109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
86111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
112+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
87113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
114+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
88115
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
89116
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
90117
</content>
91-
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
118+
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
92119
<orderEntry type="sourceFolder" forTests="false" />
93-
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
94-
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
95-
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
120+
<orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" />
121+
<orderEntry type="library" exported="" name="support-v4-24.2.1" level="project" />
122+
<orderEntry type="library" exported="" name="support-compat-24.2.1" level="project" />
123+
<orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" />
124+
<orderEntry type="library" exported="" name="animated-vector-drawable-24.2.1" level="project" />
125+
<orderEntry type="library" exported="" name="support-fragment-24.2.1" level="project" />
126+
<orderEntry type="library" exported="" name="support-core-ui-24.2.1" level="project" />
127+
<orderEntry type="library" exported="" name="appcompat-v7-24.2.1" level="project" />
128+
<orderEntry type="library" exported="" name="support-vector-drawable-24.2.1" level="project" />
129+
<orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" />
96130
<orderEntry type="module" module-name="library" exported="" />
131+
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
132+
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
97133
</component>
98134
</module>

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Thu Oct 13 00:08:00 PDT 2016
22
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-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

‎library/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
apply plugin: 'com.android.library'
2626

2727
android {
28-
compileSdkVersion 23
29-
buildToolsVersion "23.0.2"
28+
compileSdkVersion 24
29+
buildToolsVersion "24.0.2"
3030

3131
defaultConfig {
3232
minSdkVersion 18
33-
targetSdkVersion 23
34-
versionCode 34
35-
versionName "2.6.0"
33+
targetSdkVersion 24
34+
versionCode 35
35+
versionName "2.6.5"
3636
}
3737
buildTypes {
3838
release {

‎library/library.iml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,14 @@
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3839
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3940
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4041
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4142
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4244
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4345
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4446
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -65,14 +67,6 @@
6567
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6668
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6769
<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/jni" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7670
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7771
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7872
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -81,20 +75,32 @@
8175
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8276
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8377
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8487
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8588
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8689
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8790
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
8891
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
8992
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9093
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9196
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
9297
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
9399
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
94100
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
95101
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
96102
</content>
97-
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
103+
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
98104
<orderEntry type="sourceFolder" forTests="false" />
99105
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
100106
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />

0 commit comments

Comments
 (0)