Skip to content

Commit a94b5f0

Browse files
dotWeedotWee
committed
Bump gradle wrapper and android build plugin to latest release (2.10 / alpha9); fix #11 
1 parent c2410ab commit a94b5f0

3 files changed

Lines changed: 16 additions & 19 deletions

File tree

‎app/app.iml‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDevelDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDevelDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDevelDebugAndroidTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDevelDebugAndroidTestSources" />
1715
<afterSyncTasks>
18-
<task>generateDevelDebugAndroidTestSources</task>
1916
<task>generateDevelDebugSources</task>
2017
</afterSyncTasks>
2118
<option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -44,19 +41,19 @@
4441
<sourceFolder url="file://$MODULE_DIR$/src/develDebug/java" isTestSource="false" />
4542
<sourceFolder url="file://$MODULE_DIR$/src/develDebug/jni" isTestSource="false" />
4643
<sourceFolder url="file://$MODULE_DIR$/src/develDebug/rs" isTestSource="false" />
47-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/devel/debug" isTestSource="true" generated="true" />
48-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/devel/debug" isTestSource="true" generated="true" />
49-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/devel/debug" isTestSource="true" generated="true" />
50-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/devel/debug" isTestSource="true" generated="true" />
51-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/devel/debug" type="java-test-resource" />
52-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/devel/debug" type="java-test-resource" />
5344
<sourceFolder url="file://$MODULE_DIR$/src/testDevelDebug/res" type="java-test-resource" />
5445
<sourceFolder url="file://$MODULE_DIR$/src/testDevelDebug/resources" type="java-test-resource" />
5546
<sourceFolder url="file://$MODULE_DIR$/src/testDevelDebug/assets" type="java-test-resource" />
5647
<sourceFolder url="file://$MODULE_DIR$/src/testDevelDebug/aidl" isTestSource="true" />
5748
<sourceFolder url="file://$MODULE_DIR$/src/testDevelDebug/java" isTestSource="true" />
5849
<sourceFolder url="file://$MODULE_DIR$/src/testDevelDebug/jni" isTestSource="true" />
5950
<sourceFolder url="file://$MODULE_DIR$/src/testDevelDebug/rs" isTestSource="true" />
51+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/devel/debug" isTestSource="true" generated="true" />
52+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/devel/debug" isTestSource="true" generated="true" />
53+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/devel/debug" isTestSource="true" generated="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/devel/debug" isTestSource="true" generated="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/devel/debug" type="java-test-resource" />
56+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/devel/debug" type="java-test-resource" />
6057
<sourceFolder url="file://$MODULE_DIR$/src/devel/res" type="java-resource" />
6158
<sourceFolder url="file://$MODULE_DIR$/src/devel/resources" type="java-resource" />
6259
<sourceFolder url="file://$MODULE_DIR$/src/devel/assets" type="java-resource" />
@@ -99,20 +96,20 @@
9996
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
10097
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
10198
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
102-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
103-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
104-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
105-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
106-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
107-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
108-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
10999
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
110100
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
111101
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
112102
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
113103
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
114104
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
115105
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
106+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
107+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
108+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
109+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
110+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
111+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
112+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
116113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
117114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
118115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
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.0.0-alpha1'
8+
classpath 'com.android.tools.build:gradle:2.0.0-alpha9'
99
}
1010
}
1111

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Nov 30 15:50:43 CET 2015
1+
#Mon Feb 01 12:57:56 CET 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

0 commit comments

Comments
 (0)