Skip to content

Commit b45597f

Browse files
avutonavuton
committed
dmix: Update to API 21, add JMPDComm backend iml files.
1 parent 5396b81 commit b45597f

File tree

7 files changed

+137
-14
lines changed

7 files changed

+137
-14
lines changed

‎.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ local.properties
1919
.idea/dictionaries
2020
.idea/libraries
2121

22-
*.iml
23-
2422
# Local IDEA workspace
2523
.idea/workspace.xml
2624

‎.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ android:
77
# - tools
88

99
# The BuildTools version used by your project.
10-
- build-tools-20.0.0
10+
- build-tools-21.0.1
1111

1212
# The SDK version used to compile your project.
13-
- android-19
13+
- android-21
1414

1515
# Additional components
1616
# - extra-google-google_play_services
1717
# - extra-google-m2repository
1818
# - extra-android-m2repository
19-
# - addon-google_apis-google-19
19+
# - addon-google_apis-google-21
2020

2121
# This project doesn't support checkConnected, which is
2222
# the default script label for the Android plugin.

‎JMPDComm/backends/android/JMPDCommAndroid.iml

+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?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="dmix" external.system.module.version="unspecified" 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=":JMPDCommAndroid" />
7+
</configuration>
8+
</facet>
9+
<facet type="android" name="Android">
10+
<configuration>
11+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
13+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
14+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
15+
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
17+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
18+
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
19+
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20+
<option name="RES_FOLDERS_RELATIVE_PATH" value="" />
21+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
22+
<option name="LIBRARY_PROJECT" value="true" />
23+
</configuration>
24+
</facet>
25+
</component>
26+
<component name="NewModuleRootManager" inherit-compiler-output="false">
27+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
28+
<exclude-output />
29+
<content url="file://$MODULE_DIR$">
30+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
41+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
42+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
61+
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
62+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
63+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
64+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
65+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
66+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
67+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
69+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
70+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
71+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
78+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
83+
</content>
84+
<content url="file://$MODULE_DIR$/../../src/main/java">
85+
<sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
86+
</content>
87+
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
88+
<orderEntry type="sourceFolder" forTests="false" />
89+
</component>
90+
</module>
91+

‎JMPDComm/backends/android/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ repositories {
55
}
66

77
android {
8-
compileSdkVersion 19
9-
buildToolsVersion "20.0.0"
8+
compileSdkVersion 21
9+
buildToolsVersion "21.0.1"
1010

1111
lintOptions {
1212
abortOnError false

‎JMPDComm/backends/java/JMPDCommJava.iml

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?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="dmix" external.system.module.version="unspecified" 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=":JMPDCommJava" />
7+
</configuration>
8+
</facet>
9+
<facet type="java-gradle" name="Java-Gradle">
10+
<configuration>
11+
<option name="BUILD_FOLDER_PATH" />
12+
</configuration>
13+
</facet>
14+
</component>
15+
<component name="NewModuleRootManager" inherit-compiler-output="false">
16+
<output url="file://$MODULE_DIR$/build/classes/main" />
17+
<output-test url="file://$MODULE_DIR$/build/classes/test" />
18+
<exclude-output />
19+
<content url="file://$MODULE_DIR$">
20+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
21+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
22+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
23+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
24+
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
25+
<excludeFolder url="file://$MODULE_DIR$/build" />
26+
</content>
27+
<content url="file://$MODULE_DIR$/../../src/main/java">
28+
<sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
29+
</content>
30+
<orderEntry type="inheritedJdk" />
31+
<orderEntry type="sourceFolder" forTests="false" />
32+
</component>
33+
</module>
34+

‎MPDroid/MPDroid.iml

+3-3
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,14 @@
102102
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
103103
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
104104
</content>
105-
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
105+
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
106106
<orderEntry type="sourceFolder" forTests="false" />
107107
<orderEntry type="library" exported="" name="library-2.0.1" level="project" />
108108
<orderEntry type="library" exported="" name="library-0.2.0" level="project" />
109+
<orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
109110
<orderEntry type="library" exported="" name="library-0.9.3" level="project" />
111+
<orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
110112
<orderEntry type="library" exported="" name="drag-sort-listview-1.0" level="project" />
111-
<orderEntry type="library" exported="" name="support-annotations-20.0.0" level="project" />
112-
<orderEntry type="library" exported="" name="support-v4-20.0.0" level="project" />
113113
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
114114
<orderEntry type="module" module-name="JMPDCommAndroid" exported="" />
115115
</component>

‎MPDroid/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ def gitShortHash() {
2121
}
2222

2323
android {
24-
compileSdkVersion 19
25-
buildToolsVersion "20.0.0"
24+
compileSdkVersion 21
25+
buildToolsVersion "21.0.1"
2626

2727
defaultConfig {
2828
minSdkVersion 14
29-
targetSdkVersion 19
29+
targetSdkVersion 21
3030
versionCode 48
3131
versionName "1.07 Beta 8 " + gitShortHash()
3232
}
@@ -79,7 +79,7 @@ android {
7979
dependencies {
8080

8181
// Support Libraries
82-
compile 'com.android.support:support-v4:20.+'
82+
compile 'com.android.support:support-v4:21.0.0'
8383

8484
// Projects
8585
compile project(':JMPDCommAndroid')

0 commit comments

Comments
 (0)