aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kevi...@apache.org
Subject git commit: Move gradlew back to project root.
Date Mon, 14 Apr 2014 21:44:35 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master 6bd8722cf -> 1d6284441


Move gradlew back to project root.

This fixes IntelliJ integration with the gradle wrapper.

Testing Done:
Opening the gradle build script in IntelliJ 13.1 Ultimate works
out-of-the-box without the need to use the idea target.

git clean -fdx
idea build.gradle

Reviewed at https://reviews.apache.org/r/20069/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/1d628444
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/1d628444
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/1d628444

Branch: refs/heads/master
Commit: 1d62844411f8cb4b634472fb76785ca8b4228800
Parents: 6bd8722
Author: Kevin Sweeney <kevints@apache.org>
Authored: Mon Apr 14 14:44:18 2014 -0700
Committer: Kevin Sweeney <kevints@apache.org>
Committed: Mon Apr 14 14:44:18 2014 -0700

----------------------------------------------------------------------
 .gitignore                                         |   1 +
 build-support/gradle/wrapper/gradle-wrapper.jar    | Bin 50514 -> 0 bytes
 .../gradle/wrapper/gradle-wrapper.properties       |   6 ------
 build.gradle                                       |   1 -
 gradle/wrapper/gradle-wrapper.jar                  | Bin 0 -> 50514 bytes
 gradle/wrapper/gradle-wrapper.properties           |   6 ++++++
 gradlew                                            |   2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1d628444/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 7e43385..cd7bc6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.idea/
 *.iml
 *.ipr
 *.iws

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1d628444/build-support/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/build-support/gradle/wrapper/gradle-wrapper.jar b/build-support/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 667288a..0000000
Binary files a/build-support/gradle/wrapper/gradle-wrapper.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1d628444/build-support/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/build-support/gradle/wrapper/gradle-wrapper.properties b/build-support/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 7a2b29f..0000000
--- a/build-support/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Thu Feb 20 09:41:43 PST 2014
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1d628444/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index cdcc015..ea48841 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,7 +57,6 @@ tasks.matching { it instanceof Compile && it.getName() != 'compileGeneratedJava'
 
 task wrapper(type: Wrapper) {
   gradleVersion = '1.11'
-  jarFile = "/build-support/gradle/wrapper/gradle-wrapper.jar"
 }
 
 task sourceJar(type: Jar) {

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1d628444/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..667288a
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1d628444/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..7a2b29f
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Thu Feb 20 09:41:43 PST 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1d628444/gradlew
----------------------------------------------------------------------
diff --git a/gradlew b/gradlew
index 7e2b34e..e9659bf 100755
--- a/gradlew
+++ b/gradlew
@@ -80,7 +80,7 @@ cd "`dirname \"$PRG\"`/" >&-
 APP_HOME="`pwd -P`"
 cd "$SAVED" >&-
 
-CLASSPATH=$APP_HOME/build-support/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then


Mime
View raw message