Skip to content

Commit 2ae7c44

Browse files
authored
Merge pull request #330 from friederbluemle/update-gradle-wrapper
Update Gradle wrapper to 3.1
2 parents d406fed + 7d49335 commit 2ae7c44

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
.gradle
2-
gradle.properties
32
/local.properties
43
.idea
54
.DS_Store

gradle.properties

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Project-wide Gradle settings.
2+
3+
# IDE (e.g. Android Studio) users:
4+
# Gradle settings configured through the IDE *will override*
5+
# any settings specified in this file.
6+
7+
# For more details on how to configure your build environment visit
8+
# http://www.gradle.org/docs/current/userguide/build_environment.html
9+
10+
# Specifies the JVM arguments used for the daemon process.
11+
# The setting is particularly useful for tweaking memory settings.
12+
# Default value: -Xmx10248m -XX:MaxPermSize=256m
13+
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
14+
org.gradle.jvmargs=-Xmx1536m
15+
16+
# When configured, Gradle will run in incubating parallel mode.
17+
# This option should only be used with decoupled projects. More details, visit
18+
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
19+
# org.gradle.parallel=true
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Aug 02 23:08:04 SGT 2016
1+
#Tue Sep 27 18:02:33 SGT 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.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip

0 commit comments

Comments
 (0)