Skip to content

Commit da65956

Browse files
BenoitDuffezabarisain
BenoitDuffez
authored and
abarisain
committed
fixed some gradle stuff
1 parent 14f6eeb commit da65956

14 files changed

+287
-52
lines changed

‎.idea/libraries/AsiaIvityAndroidDragSortListview10_aar.xml

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

‎.idea/libraries/ComAndroidSupportAppcompatV71900_aar.xml

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

‎.idea/libraries/ComGithubChrisbanesActionbarpulltorefreshExtraAbc09_aar.xml

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

‎.idea/libraries/ComGithubChrisbanesActionbarpulltorefreshLibrary09_aar.xml

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

‎.idea/libraries/jmdns_3_4_1.xml

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

‎.idea/libraries/support_v4_19_0_0.xml

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

‎.idea/modules.xml

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

‎JMPDComm/JMPDComm.iml

+66-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,76 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module classpath="eclipse" classpath-dir="$MODULE_DIR$" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android" name="Android">
55
<configuration>
6+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
7+
<option name="ASSEMBLE_TASK_NAME" value="bundleDebug" />
8+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
9+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
10+
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
11+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
12+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
13+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
614
<option name="LIBRARY_PROJECT" value="true" />
715
</configuration>
816
</facet>
17+
<facet type="android-gradle" name="Android-Gradle">
18+
<configuration>
19+
<option name="GRADLE_PROJECT_PATH" value=":JMPDComm" />
20+
</configuration>
21+
</facet>
22+
</component>
23+
<component name="NewModuleRootManager" inherit-compiler-output="false">
24+
<output url="file://$MODULE_DIR$/build/classes/debug" />
25+
<exclude-output />
26+
<content url="file://$MODULE_DIR$">
27+
<sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" />
28+
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" generated="true" />
29+
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" generated="true" />
30+
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
38+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
39+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
40+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
41+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
42+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
46+
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/assets" isTestSource="true" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" type="java-test-resource" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" type="java-test-resource" />
58+
<excludeFolder url="file://$MODULE_DIR$/.externalToolBuilders" />
59+
<excludeFolder url="file://$MODULE_DIR$/.settings" />
60+
<excludeFolder url="file://$MODULE_DIR$/build/apk" />
61+
<excludeFolder url="file://$MODULE_DIR$/build/assets" />
62+
<excludeFolder url="file://$MODULE_DIR$/build/bundles" />
63+
<excludeFolder url="file://$MODULE_DIR$/build/classes" />
64+
<excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
65+
<excludeFolder url="file://$MODULE_DIR$/build/incremental" />
66+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
67+
<excludeFolder url="file://$MODULE_DIR$/build/manifests" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/res" />
69+
<excludeFolder url="file://$MODULE_DIR$/build/symbols" />
70+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
71+
</content>
72+
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
73+
<orderEntry type="sourceFolder" forTests="false" />
974
</component>
1075
</module>
1176

‎JmDNS/JmDNS.iml

+24-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module classpath="eclipse" classpath-dir="$MODULE_DIR$" type="JAVA_MODULE" version="4" />
2+
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android-gradle" name="Android-Gradle">
5+
<configuration>
6+
<option name="GRADLE_PROJECT_PATH" value=":JmDNS" />
7+
</configuration>
8+
</facet>
9+
</component>
10+
<component name="NewModuleRootManager" inherit-compiler-output="false">
11+
<output url="file://$MODULE_DIR$/build/classes/main" />
12+
<output-test url="file://$MODULE_DIR$/build/classes/test" />
13+
<exclude-output />
14+
<content url="file://$MODULE_DIR$">
15+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
16+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
17+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
18+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
19+
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
20+
<excludeFolder url="file://$MODULE_DIR$/build" />
21+
</content>
22+
<orderEntry type="inheritedJdk" />
23+
<orderEntry type="sourceFolder" forTests="false" />
24+
</component>
25+
</module>
326

‎MPDroid/MPDroid.iml

+66-25
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,83 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module type="JAVA_MODULE" version="4">
3-
<component name="EclipseModuleManager" forced_jdk="true">
4-
<conelement value="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK" />
5-
<conelement value="com.android.ide.eclipse.adt.LIBRARIES" />
6-
<src_description expected_position="1">
7-
<src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
8-
<src_folder value="file://$MODULE_DIR$/gen" expected_position="1" />
9-
</src_description>
10-
</component>
2+
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
113
<component name="FacetManager">
124
<facet type="android" name="Android">
135
<configuration>
14-
<option name="UPDATE_PROPERTY_FILES" value="false" />
6+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
7+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
8+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
9+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
10+
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
11+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
12+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
13+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
14+
<option name="UPDATE_PROPERTY_FILES" value="true" />
15+
</configuration>
16+
</facet>
17+
<facet type="android-gradle" name="Android-Gradle">
18+
<configuration>
19+
<option name="GRADLE_PROJECT_PATH" value=":MPDroid" />
1520
</configuration>
1621
</facet>
1722
</component>
1823
<component name="NewModuleRootManager" inherit-compiler-output="false">
19-
<output url="file://$MODULE_DIR$/bin/classes" />
24+
<output url="file://$MODULE_DIR$/build/classes/debug" />
2025
<exclude-output />
2126
<content url="file://$MODULE_DIR$">
27+
<sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" />
28+
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" generated="true" />
29+
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" generated="true" />
30+
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
38+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
39+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
40+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
41+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
42+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
2246
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
23-
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/assets" isTestSource="true" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" type="java-test-resource" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" type="java-test-resource" />
58+
<excludeFolder url="file://$MODULE_DIR$/build/apk" />
59+
<excludeFolder url="file://$MODULE_DIR$/build/assets" />
60+
<excludeFolder url="file://$MODULE_DIR$/build/bundles" />
61+
<excludeFolder url="file://$MODULE_DIR$/build/classes" />
62+
<excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
63+
<excludeFolder url="file://$MODULE_DIR$/build/incremental" />
64+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
65+
<excludeFolder url="file://$MODULE_DIR$/build/manifests" />
66+
<excludeFolder url="file://$MODULE_DIR$/build/res" />
67+
<excludeFolder url="file://$MODULE_DIR$/build/symbols" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
2469
</content>
25-
<orderEntry type="inheritedJdk" />
70+
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
2671
<orderEntry type="sourceFolder" forTests="false" />
2772
<orderEntry type="module" module-name="JmDNS" exported="" />
28-
<orderEntry type="module" module-name="JMPDComm" />
29-
<orderEntry type="module-library">
30-
<library>
31-
<CLASSES>
32-
<root url="jar://$MODULE_DIR$/libs/android-support-v4.jar!/" />
33-
</CLASSES>
34-
<JAVADOC />
35-
<SOURCES />
36-
</library>
37-
</orderEntry>
38-
<orderEntry type="module" module-name="DragSortListView" />
39-
<orderEntry type="module" module-name="PullToRefresh" />
73+
<orderEntry type="module" module-name="SmoothProgressBar" exported="" />
74+
<orderEntry type="library" exported="" name="jmdns-3.4.1" level="project" />
75+
<orderEntry type="module" module-name="JMPDComm" exported="" />
76+
<orderEntry type="library" exported="" name="ComGithubChrisbanesActionbarpulltorefreshLibrary09.aar" level="project" />
77+
<orderEntry type="library" exported="" name="support-v4-19.0.0" level="project" />
78+
<orderEntry type="library" exported="" name="ComGithubChrisbanesActionbarpulltorefreshExtraAbc09.aar" level="project" />
79+
<orderEntry type="library" exported="" name="AsiaIvityAndroidDragSortListview10.aar" level="project" />
80+
<orderEntry type="library" exported="" name="ComAndroidSupportAppcompatV71900.aar" level="project" />
4081
</component>
4182
</module>
4283

‎MPDroid/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ dependencies {
99

1010
// Support Libraries
1111
compile 'com.android.support:support-v4:19.0.+'
12-
// compile 'com.android.support:appcompat-v7:19.0.+'
1312

1413
// Projects
15-
// compile project(':JmDNS')
14+
compile project(':JmDNS')
1615
compile project(':JMPDComm')
1716
compile project(':SmoothProgressBar')
1817

‎MPDroid/project.properties

+2-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,5 @@
1212

1313
# Project target.
1414
target=android-19
15-
android.library.reference.1=../JMPDComm
16-
17-
android.library.reference.2=../DragSortListView
18-
android.library.reference.3=../PullToRefresh
15+
android.library.reference.1=../SmoothProgressBar
16+
android.library.reference.2=../JMPDComm

0 commit comments

Comments
 (0)