Skip to content

Commit db34d5d

Browse files
mcsongmcsong
committed
Updates build script
1 parent 22625e6 commit db34d5d

File tree

2 files changed

+36
-26
lines changed

2 files changed

+36
-26
lines changed

‎Library/Library.iml‎

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
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="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
18-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
15+
<afterSyncTasks>
16+
<task>generateDebugSources</task>
17+
</afterSyncTasks>
1918
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2019
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2120
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -25,69 +24,82 @@
2524
</configuration>
2625
</facet>
2726
</component>
28-
<component name="NewModuleRootManager" inherit-compiler-output="false">
27+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2928
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
30-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
29+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3130
<exclude-output />
3231
<content url="file://$MODULE_DIR$">
3332
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3433
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3534
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3635
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3736
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
38-
<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" />
3938
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4039
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4140
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4241
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
4342
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
44-
<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" />
4544
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4645
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4746
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4847
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4948
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5049
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5150
<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" />
5260
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5361
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5462
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5563
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5664
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5765
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5866
<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" />
5976
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6077
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6178
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6279
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6380
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6481
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6582
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
66-
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
6785
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
6887
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
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" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.0.0/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/jars" />
7492
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7895
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-22.jar" />
8397
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8498
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
85100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
87102
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
91103
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
92104
</content>
93105
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />

‎Library/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,4 @@ android {
2424
dependencies {
2525
compile fileTree(dir: 'libs', include: ['*.jar'])
2626
compile 'com.android.support:appcompat-v7:22.0.0'
27-
}
28-
29-
apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
27+
}

0 commit comments

Comments
 (0)