Skip to content

Commit 8449048

Browse files
author
Douglas Nassif Roma Junior
committed
Updating source
1 parent ac0cab2 commit 8449048

File tree

14 files changed

+344
-210
lines changed

14 files changed

+344
-210
lines changed

‎AndroidBluetoothLibrary.iml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id="AndroidBluetoothLibrary" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>
66
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7+
<option name="BUILDABLE" value="false" />
78
</configuration>
89
</facet>
910
</component>
10-
<component name="NewModuleRootManager" inherit-compiler-output="true">
11+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
1112
<exclude-output />
1213
<content url="file://$MODULE_DIR$">
1314
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1415
</content>
1516
<orderEntry type="inheritedJdk" />
1617
<orderEntry type="sourceFolder" forTests="false" />
1718
</component>
18-
</module>
19-
19+
</module>

‎BluetoothClassicLibrary/BluetoothClassicLibrary.iml‎

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="AndroidBluetoothLibrary" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":BluetoothClassicLibrary" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="AndroidBluetoothLibrary" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -12,21 +12,21 @@
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="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
17-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
15+
<afterSyncTasks>
16+
<task>generateDebugSources</task>
17+
</afterSyncTasks>
1818
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1919
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2020
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
21-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
21+
<option name="RES_FOLDERS_RELATIVE_PATH" value="" />
2222
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2323
<option name="LIBRARY_PROJECT" value="true" />
2424
</configuration>
2525
</facet>
2626
</component>
27-
<component name="NewModuleRootManager" inherit-compiler-output="false">
27+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2828
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
29-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
29+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3030
<exclude-output />
3131
<content url="file://$MODULE_DIR$">
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -48,44 +48,54 @@
4848
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4949
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5050
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" 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" />
5158
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5259
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5360
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5461
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5562
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5663
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5764
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
5872
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
5973
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6074
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6175
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6276
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6377
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6478
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
6580
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6681
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6782
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
6983
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7284
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
7685
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
7786
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-25.jar" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-7.jar" />
8189
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
8291
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8392
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8493
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8594
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8695
</content>
87-
<orderEntry type="jdk" jdkName="Android API 7 Platform" jdkType="Android SDK" />
96+
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
8897
<orderEntry type="sourceFolder" forTests="false" />
98+
<orderEntry type="library" exported="" name="support-annotations-25.0.0" level="project" />
99+
<orderEntry type="library" exported="" scope="TEST" name="mockable-android-25" level="project" />
89100
</component>
90-
</module>
91-
101+
</module>

‎BluetoothClassicLibrary/build.gradle‎

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

33
android {
4-
compileSdkVersion 7
5-
buildToolsVersion "22.0.1"
4+
compileSdkVersion 25
5+
buildToolsVersion '25.0.0'
66
defaultConfig {
77
minSdkVersion 7
88
targetSdkVersion 7
@@ -24,5 +24,5 @@ android {
2424
}
2525

2626
dependencies {
27-
compile fileTree(include: ['*.jar'], dir: 'libs')
27+
compile 'com.android.support:support-annotations:25.0.0'
2828
}

‎BluetoothClassicLibrary/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.github.douglasjunior.bluetoothclassiclibrary">
33

4-
<application android:allowBackup="true" android:label="BluetoothClassicLibrary">
4+
<application android:allowBackup="false" >
55

66
</application>
77

0 commit comments

Comments
 (0)