diff options
| author | Kenny Root <kenny@the-b.org> | 2014-10-01 19:42:51 +0100 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2014-10-01 19:49:25 +0100 |
| commit | b9fd438a0cfb931a2060f9d2575fbbb4e7f278b0 (patch) | |
| tree | 69847f792032b64a1f0d70dfed740962b081313e | |
| parent | 6bbd2c4dece23d463561107d1413efaf257f4084 (diff) | |
| download | connectbot-b9fd438a0cfb931a2060f9d2575fbbb4e7f278b0.tar.gz connectbot-b9fd438a0cfb931a2060f9d2575fbbb4e7f278b0.tar.bz2 connectbot-b9fd438a0cfb931a2060f9d2575fbbb4e7f278b0.zip | |
Upgrade to newer gradle
| -rw-r--r-- | app/app.iml | 7 | ||||
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/app/app.iml b/app/app.iml index 209bcb0..d97d96b 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="connectbot1" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> +<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="connectbot" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="android-gradle" name="Android-Gradle"> <configuration> @@ -10,7 +10,7 @@ <configuration> <option name="SELECTED_BUILD_VARIANT" value="debug" /> <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> - <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" /> + <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" /> <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" /> <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" /> @@ -77,8 +77,9 @@ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> + <excludeFolder url="file://$MODULE_DIR$/build/reports" /> </content> - <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" /> + <orderEntry type="jdk" jdkName="Android API 20 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> </component> </module> diff --git a/build.gradle b/build.gradle index a6e5442..b9ba100 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:0.12.2' + classpath 'com.android.tools.build:gradle:0.13.0' classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1e61d1f..471df12 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Wed Oct 01 19:40:59 BST 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-all.zip |