Skip to content

Commit 13bf519

Browse files
committed
Bump android build tools and gradle versions.
1 parent afd1481 commit 13bf519

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:1.3.1'
10+
classpath 'com.android.tools.build:gradle:1.5.0'
1111
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
1212
classpath "com.fernandocejas.frodo:frodo-plugin:0.8.2"
1313
}
@@ -25,7 +25,7 @@ allprojects {
2525

2626
task wrapper(type: Wrapper) {
2727
description 'Creates the gradle wrapper.'
28-
gradleVersion '2.8'
28+
gradleVersion '2.10'
2929
}
3030

3131
task runDomainUnitTests(dependsOn: [':domain:test']) {

gradle/wrapper/gradle-wrapper.jar

1 Byte
Binary file not shown.
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Nov 17 23:40:11 CET 2015
1+
#Tue Jan 19 23:59:31 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-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip

gradlew

+3-7
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ case "`uname`" in
4242
;;
4343
esac
4444

45-
# For Cygwin, ensure paths are in UNIX format before anything is touched.
46-
if $cygwin ; then
47-
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
48-
fi
49-
5045
# Attempt to set APP_HOME
5146
# Resolve links: $0 may be a link
5247
PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
6156
fi
6257
done
6358
SAVED="`pwd`"
64-
cd "`dirname \"$PRG\"`/" >&-
59+
cd "`dirname \"$PRG\"`/" >/dev/null
6560
APP_HOME="`pwd -P`"
66-
cd "$SAVED" >&-
61+
cd "$SAVED" >/dev/null
6762

6863
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6964

@@ -114,6 +109,7 @@ fi
114109
if $cygwin ; then
115110
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116111
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
112+
JAVACMD=`cygpath --unix "$JAVACMD"`
117113

118114
# We build the pattern for arguments to be converted via cygpath
119115
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

0 commit comments

Comments
 (0)