Skip to content

Commit 3fb0cba

Browse files
yipianfengyeyipianfengye
committed
更新gradle脚本配置信息
1 parent 28c2df4 commit 3fb0cba

File tree

3 files changed

+10
-54
lines changed

3 files changed

+10
-54
lines changed

‎adlibrary/adlibrary.iml

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,12 @@
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3736
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3837
<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" />
43-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4442
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4543
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4644
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -50,62 +48,41 @@
5048
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5149
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5250
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
53-
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
5451
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5552
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5653
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5754
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5855
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
5956
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
6057
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
61-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
6258
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
6359
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6460
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6561
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6662
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6763
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6864
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
7065
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7166
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7267
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
7368
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
7469
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
7570
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
7671
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7872
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7973
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8074
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
8175
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
8276
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
8377
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8478
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
85-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
8879
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8981
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
9082
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
9183
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
9284
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-core/2.2.2/jars" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-idling-resource/2.2.2/jars" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/exposed-instrumentation-api-publish/0.5/jars" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/rules/0.5/jars" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/runner/0.5/jars" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/jars" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/drawee/0.12.0/jars" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fbcore/0.12.0/jars" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fresco/0.12.0/jars" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-base/0.12.0/jars" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.12.0/jars" />
10785
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.flyco.pageindicator/FlycoPageIndicator_Lib/1.0.0/jars" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.malinskiy/materialicons/1.0.2/jars" />
10986
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
11087
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
11188
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
@@ -116,14 +93,7 @@
11693
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
11794
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
11895
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
119-
<excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
120-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
12196
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
122-
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
123-
<excludeFolder url="file://$MODULE_DIR$/build/release" />
124-
<excludeFolder url="file://$MODULE_DIR$/build/release-1.0.zip" />
125-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
126-
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
12797
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
12898
</content>
12999
<orderEntry type="jdk" jdkName="Android API 23 Platform (1)" jdkType="Android SDK" />

‎app/app.iml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,12 @@
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3635
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3736
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3837
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3938
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4039
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4140
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4341
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4442
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4543
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -49,45 +47,40 @@
4947
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5048
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5149
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
52-
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
5350
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5451
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5552
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5653
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5754
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
5855
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
5956
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
60-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
6157
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
6258
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6359
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6460
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6561
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6662
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6763
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7764
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7865
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7966
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
8067
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
8168
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8269
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8370
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
84-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8578
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8679
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8781
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8882
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8983
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/cn.yipianfengye.android/ad-library/1.0/jars" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.constraint/constraint-layout/1.0.0-alpha4/jars" />
9184
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-core/2.2.2/jars" />
9285
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-idling-resource/2.2.2/jars" />
9386
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/exposed-instrumentation-api-publish/0.5/jars" />
@@ -115,14 +108,11 @@
115108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
116109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
117110
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
118-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
119-
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
120111
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
121112
</content>
122113
<orderEntry type="jdk" jdkName="Android API 23 Platform (1)" jdkType="Android SDK" />
123114
<orderEntry type="sourceFolder" forTests="false" />
124115
<orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
125-
<orderEntry type="library" exported="" name="constraint-layout-solver-1.0.0-alpha4" level="project" />
126116
<orderEntry type="library" exported="" scope="TEST" name="runner-0.5" level="project" />
127117
<orderEntry type="library" exported="" scope="TEST" name="espresso-idling-resource-2.2.2" level="project" />
128118
<orderEntry type="library" exported="" name="materialicons-1.0.2" level="project" />
@@ -131,7 +121,6 @@
131121
<orderEntry type="library" exported="" name="fresco-0.12.0" level="project" />
132122
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
133123
<orderEntry type="library" exported="" name="bolts-tasks-1.4.0" level="project" />
134-
<orderEntry type="library" exported="" name="constraint-layout-1.0.0-alpha4" level="project" />
135124
<orderEntry type="library" exported="" name="animated-vector-drawable-23.4.0" level="project" />
136125
<orderEntry type="library" exported="" name="rebound-0.3.8" level="project" />
137126
<orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />

‎build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.0-alpha5'
8+
classpath 'com.android.tools.build:gradle:2.0.0'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files
@@ -15,9 +15,6 @@ buildscript {
1515
allprojects {
1616
repositories {
1717
jcenter()
18-
maven {
19-
url 'https://dl.bintray.com/yipianfengye/maven'
20-
}
2118
}
2219
}
2320

0 commit comments

Comments
 (0)