Skip to content

Commit 9d281e2

Browse files
DeveloperPaul123DeveloperPaul123
committed
Upgrading to latest libraries.
1 parent a9a736d commit 9d281e2

File tree

8 files changed

+89
-39
lines changed

8 files changed

+89
-39
lines changed

‎.idea/gradle.xml

+8-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml

+1-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/app.iml

+27-8
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,43 +25,64 @@
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" />
3835
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
4037
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4138
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4239
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4340
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
4441
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
45-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4643
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4744
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4845
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4946
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
5047
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5148
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5249
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5359
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5460
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5561
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5662
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5763
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5864
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5965
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
6067
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6168
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6269
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6370
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6471
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6572
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6673
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
6783
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6886
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
6987
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7088
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
@@ -74,15 +92,16 @@
7492
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
7593
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
7694
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
7796
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
7897
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
7998
<excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
8099
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
81100
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
82101
</content>
83-
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
102+
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
84103
<orderEntry type="sourceFolder" forTests="false" />
85-
<orderEntry type="library" exported="" name="support-annotations-23.2.0" level="project" />
104+
<orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" />
86105
<orderEntry type="module" module-name="btutillib" exported="" />
87106
</component>
88107
</module>

‎app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 23
4+
compileSdkVersion 24
55
buildToolsVersion '22.0.1'
66
defaultConfig {
77
applicationId 'com.devpaul.bluetoothutilitydemo'
88
minSdkVersion 14
9-
targetSdkVersion 23
9+
targetSdkVersion 24
1010
versionCode 5
1111
versionName '1.4'
1212
}

‎btutillib/btutillib.iml

+42-16
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" />
@@ -29,71 +26,100 @@
2926
</component>
3027
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3128
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
32-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
29+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3330
<exclude-output />
3431
<content url="file://$MODULE_DIR$">
3532
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3633
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3734
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3835
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3936
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
40-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
4138
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4239
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4340
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4441
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
4542
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
46-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4744
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4845
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4946
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
5047
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
5148
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5249
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5350
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5460
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5561
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5662
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5763
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5864
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5965
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6066
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
6176
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6277
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6378
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6479
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6580
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6681
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6782
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
6884
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
6985
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
7086
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
7188
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7289
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
7390
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7491
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7594
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
7695
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
7796
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
7897
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
7998
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
80100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
81102
<excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
82103
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
83104
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
84105
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
85106
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
86107
</content>
87-
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
108+
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
88109
<orderEntry type="sourceFolder" forTests="false" />
89-
<orderEntry type="library" exported="" name="core-0.8.5.6" level="project" />
90-
<orderEntry type="library" exported="" name="recyclerview-v7-23.2.0" level="project" />
91-
<orderEntry type="library" exported="" name="support-v4-23.2.0" level="project" />
92-
<orderEntry type="library" exported="" name="library-1.1.4" level="project" />
93-
<orderEntry type="library" exported="" name="support-annotations-23.2.0" level="project" />
94-
<orderEntry type="library" exported="" name="appcompat-v7-23.2.0" level="project" />
95-
<orderEntry type="library" exported="" name="animated-vector-drawable-23.2.0" level="project" />
96-
<orderEntry type="library" exported="" name="support-vector-drawable-23.2.0" level="project" />
97-
<orderEntry type="library" exported="" name="design-23.1.1" level="project" />
110+
<orderEntry type="library" exported="" name="support-v4-24.2.1" level="project" />
111+
<orderEntry type="library" exported="" name="support-compat-24.2.1" level="project" />
112+
<orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" />
113+
<orderEntry type="library" exported="" name="animated-vector-drawable-24.2.1" level="project" />
114+
<orderEntry type="library" exported="" name="support-fragment-24.2.1" level="project" />
115+
<orderEntry type="library" exported="" name="support-core-ui-24.2.1" level="project" />
116+
<orderEntry type="library" exported="" name="recyclerview-v7-24.2.1" level="project" />
117+
<orderEntry type="library" exported="" name="appcompat-v7-24.2.1" level="project" />
118+
<orderEntry type="library" exported="" name="support-vector-drawable-24.2.1" level="project" />
119+
<orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" />
120+
<orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" />
121+
<orderEntry type="library" exported="" name="design-24.0.0" level="project" />
122+
<orderEntry type="library" exported="" name="library-1.1.7" level="project" />
123+
<orderEntry type="library" exported="" name="core-0.9.0.2" level="project" />
98124
</component>
99125
</module>

0 commit comments

Comments
 (0)