Skip to content

Commit 27e161c

Browse files
justasmjustasm
committed
Update project gradle plugin. Remove unused repository references.
1 parent f5c867e commit 27e161c

File tree

3 files changed

+23
-31
lines changed

3 files changed

+23
-31
lines changed

‎build.gradle

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33
buildscript {
44
repositories {
55
jcenter()
6-
mavenCentral()
7-
mavenLocal()
8-
maven { url 'https://github.com/steffenschaefer/gwt-gradle-plugin/raw/maven-repo/' }
96
}
107
dependencies {
11-
classpath 'com.android.tools.build:gradle:1.0.0'
8+
classpath 'com.android.tools.build:gradle:1.2.3'
129

1310
// NOTE: Do not place your application dependencies here; they belong
1411
// in the individual module build.gradle files
@@ -18,9 +15,5 @@ buildscript {
1815
allprojects {
1916
repositories {
2017
jcenter()
21-
mavenLocal()
22-
mavenCentral()
23-
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
24-
maven { url "https://oss.sonatype.org/content/repositories/releases/" }
2518
}
2619
}

‎library/library.iml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1515
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
17-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
18-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
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" />
1919
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2020
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2121
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -27,7 +27,7 @@
2727
</component>
2828
<component name="NewModuleRootManager" inherit-compiler-output="false">
2929
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
30-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
30+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
3131
<exclude-output />
3232
<content url="file://$MODULE_DIR$">
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -36,12 +36,12 @@
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
40-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
43-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
44-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
43+
<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" />
4545
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4646
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4747
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -63,14 +63,14 @@
6363
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6464
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
66-
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
6766
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6867
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6968
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
7069
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
7170
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7271
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7372
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.1.1/jars" />
7474
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7575
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
7676
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -83,9 +83,7 @@
8383
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
8786
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/publications" />
8987
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9088
</content>
9189
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />

‎sample/sample.iml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1515
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
17-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
18-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
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" />
1919
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2020
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2121
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -26,7 +26,7 @@
2626
</component>
2727
<component name="NewModuleRootManager" inherit-compiler-output="false">
2828
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
29-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
29+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
3030
<exclude-output />
3131
<content url="file://$MODULE_DIR$">
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -35,12 +35,12 @@
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
40-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
43-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
4444
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4545
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4646
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -69,6 +69,7 @@
6969
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7070
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7171
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.1.1/jars" />
7273
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7374
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
7475
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />

0 commit comments

Comments
 (0)