Skip to content

Commit b005287

Browse files
authored
Merge pull request #4 from trevjonez/issue3
Add fails method to block checks
2 parents 1e5c8f2 + 36a230f commit b005287

21 files changed

+111
-80
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
.gradle
33
/local.properties
44
/.idea/workspace.xml
5+
/.idea/gradle.xml
6+
/.idea/modules.xml
7+
/.idea/vcs.xml
58
/.idea/libraries
69
.DS_Store
710
/build

.idea/gradle.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

.idea/modules.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.idea/runConfigurations.xml

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ android:
44
components:
55
- platform-tools
66
- tools
7-
- build-tools-24.0.0
7+
- build-tools-24.0.1
88
- android-24
99
- extra-android-m2repository
1010

build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ buildscript {
44
maven { url "https://jitpack.io" }
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.2.0-alpha5'
8-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4'
7+
classpath 'com.android.tools.build:gradle:2.2.0-beta2'
8+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
99
classpath 'me.tatarka:gradle-retrolambda:3.2.5'
1010
classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
11-
classpath 'com.google.guava:guava:19.0'
1211
}
1312

1413
configurations.classpath.exclude group: 'com.android.tools.external.lombok'
@@ -25,6 +24,6 @@ task clean(type: Delete) {
2524
}
2625

2726
task wrapper(type: Wrapper) {
28-
gradleVersion = '2.14'
27+
gradleVersion = '3.0'
2928
distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
3029
}

gradle/wrapper/gradle-wrapper.jar

-501 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Jun 23 16:43:15 MDT 2016
1+
#Fri Aug 19 19:28:02 MDT 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-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip

gradlew

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,9 @@ function splitJvmOpts() {
161161
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162162
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
163163

164+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
165+
if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
166+
cd "$(dirname "$0")"
167+
fi
168+
164169
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ goto fail
4949
@rem Get command-line arguments, handling Windows variants
5050

5151
if not "%OS%" == "Windows_NT" goto win9xME_args
52-
if "%@eval[2+2]" == "4" goto 4NT_args
5352

5453
:win9xME_args
5554
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
6059
if "x%~1" == "x" goto execute
6160

6261
set CMD_LINE_ARGS=%*
63-
goto execute
64-
65-
:4NT_args
66-
@rem Get arguments from the 4NT Shell from JP Software
67-
set CMD_LINE_ARGS=%$
6862

6963
:execute
7064
@rem Setup the command line

0 commit comments

Comments
 (0)