Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6f9cf3a

Browse files
Bump dependencies:
- Gradle. - Android Build tools. - Robolectric: fix failing tests.
1 parent 7339de7 commit 6f9cf3a

File tree

8 files changed

+61
-55
lines changed

8 files changed

+61
-55
lines changed

‎build.gradle

Lines changed: 1 addition & 1 deletion
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:2.1.0'
10+
classpath 'com.android.tools.build:gradle:2.2.2'
1111
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
1212
classpath "com.fernandocejas.frodo:frodo-plugin:0.8.3"
1313
}

‎buildsystem/dependencies.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ allprojects {
66

77
ext {
88
//Android
9-
androidBuildToolsVersion = "23.0.1"
9+
androidBuildToolsVersion = "24.0.1"
1010
androidMinSdkVersion = 15
1111
androidTargetSdkVersion = 21
1212
androidCompileSdkVersion = 21
1313

1414
//Libraries
15-
daggerVersion = '2.0.2'
15+
daggerVersion = '2.8'
1616
butterKnifeVersion = '7.0.1'
1717
recyclerViewVersion = '21.0.3'
1818
rxJavaVersion = '1.0.14'
@@ -24,7 +24,7 @@ ext {
2424
androidAnnotationsVersion = '21.0.3'
2525

2626
//Testing
27-
robolectricVersion = '3.0'
27+
robolectricVersion = '3.1.1'
2828
jUnitVersion = '4.12'
2929
assertJVersion = '1.7.1'
3030
mockitoVersion = '1.9.5'

‎data/src/test/java/com/fernandocejas/android10/sample/data/ApplicationTestCase.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,20 @@
1616
package com.fernandocejas.android10.sample.data;
1717

1818
import android.content.Context;
19+
import java.io.File;
1920
import org.junit.Rule;
2021
import org.junit.rules.TestRule;
2122
import org.junit.runner.RunWith;
2223
import org.mockito.MockitoAnnotations;
23-
import org.robolectric.RobolectricGradleTestRunner;
24+
import org.robolectric.RobolectricTestRunner;
2425
import org.robolectric.RuntimeEnvironment;
2526
import org.robolectric.annotation.Config;
2627

2728
/**
2829
* Base class for Robolectric data layer tests.
2930
* Inherit from this class to create a test.
3031
*/
31-
@RunWith(RobolectricGradleTestRunner.class)
32+
@RunWith(RobolectricTestRunner.class)
3233
@Config(constants = BuildConfig.class, application = ApplicationStub.class, sdk = 21)
3334
public abstract class ApplicationTestCase {
3435

@@ -40,4 +41,8 @@ public abstract class ApplicationTestCase {
4041
public static Context context() {
4142
return RuntimeEnvironment.application;
4243
}
44+
45+
public static File cacheDir() {
46+
return RuntimeEnvironment.application.getCacheDir();
47+
}
4348
}

‎data/src/test/java/com/fernandocejas/android10/sample/data/cache/FileManagerTest.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.junit.After;
2121
import org.junit.Before;
2222
import org.junit.Test;
23-
import org.robolectric.RuntimeEnvironment;
2423

2524
import static org.hamcrest.CoreMatchers.equalTo;
2625
import static org.hamcrest.CoreMatchers.is;
@@ -29,18 +28,16 @@
2928
public class FileManagerTest extends ApplicationTestCase {
3029

3130
private FileManager fileManager;
32-
private File cacheDir;
3331

3432
@Before
3533
public void setUp() {
3634
fileManager = new FileManager();
37-
cacheDir = RuntimeEnvironment.application.getCacheDir();
3835
}
3936

4037
@After
4138
public void tearDown() {
42-
if (cacheDir != null) {
43-
fileManager.clearDirectory(cacheDir);
39+
if (cacheDir() != null) {
40+
fileManager.clearDirectory(cacheDir());
4441
}
4542
}
4643

@@ -66,9 +63,7 @@ public void testFileContent() {
6663
}
6764

6865
private File createDummyFile() {
69-
String dummyFilePath = cacheDir.getPath() + File.separator + "dumyFile";
70-
File dummyFile = new File(dummyFilePath);
71-
72-
return dummyFile;
66+
String dummyFilePath = cacheDir().getPath() + File.separator + "dummyFile";
67+
return new File(dummyFilePath);
7368
}
7469
}

‎gradle/wrapper/gradle-wrapper.jar

590 Bytes
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Jan 19 23:59:31 CET 2016
1+
#Wed Dec 21 17:11:04 ART 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.10-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip

‎gradlew

Lines changed: 40 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,35 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
22

33
##############################################################################
44
##
55
## Gradle start up script for UN*X
66
##
77
##############################################################################
88

9-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10-
DEFAULT_JVM_OPTS=""
9+
# Attempt to set APP_HOME
10+
# Resolve links: 0ドル may be a link
11+
PRG="0ドル"
12+
# Need this for relative symlinks.
13+
while [ -h "$PRG" ] ; do
14+
ls=`ls -ld "$PRG"`
15+
link=`expr "$ls" : '.*-> \(.*\)$'`
16+
if expr "$link" : '/.*' > /dev/null; then
17+
PRG="$link"
18+
else
19+
PRG=`dirname "$PRG"`"/$link"
20+
fi
21+
done
22+
SAVED="`pwd`"
23+
cd "`dirname \"$PRG\"`/" >/dev/null
24+
APP_HOME="`pwd -P`"
25+
cd "$SAVED" >/dev/null
1126

1227
APP_NAME="Gradle"
1328
APP_BASE_NAME=`basename "0ドル"`
1429

30+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31+
DEFAULT_JVM_OPTS=""
32+
1533
# Use the maximum available, or set MAX_FD != -1 to use that value.
1634
MAX_FD="maximum"
1735

@@ -30,6 +48,7 @@ die ( ) {
3048
cygwin=false
3149
msys=false
3250
darwin=false
51+
nonstop=false
3352
case "`uname`" in
3453
CYGWIN* )
3554
cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
4059
MINGW* )
4160
msys=true
4261
;;
62+
NONSTOP* )
63+
nonstop=true
64+
;;
4365
esac
4466

45-
# Attempt to set APP_HOME
46-
# Resolve links: 0ドル may be a link
47-
PRG="0ドル"
48-
# Need this for relative symlinks.
49-
while [ -h "$PRG" ] ; do
50-
ls=`ls -ld "$PRG"`
51-
link=`expr "$ls" : '.*-> \(.*\)$'`
52-
if expr "$link" : '/.*' > /dev/null; then
53-
PRG="$link"
54-
else
55-
PRG=`dirname "$PRG"`"/$link"
56-
fi
57-
done
58-
SAVED="`pwd`"
59-
cd "`dirname \"$PRG\"`/" >/dev/null
60-
APP_HOME="`pwd -P`"
61-
cd "$SAVED" >/dev/null
62-
6367
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6468

6569
# Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
8589
fi
8690

8791
# Increase the maximum file descriptors if we can.
88-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
92+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a"$nonstop"="false"] ; then
8993
MAX_FD_LIMIT=`ulimit -H -n`
9094
if [ $? -eq 0 ] ; then
9195
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
150154
esac
151155
fi
152156

153-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
154-
function splitJvmOpts() {
155-
JVM_OPTS=("$@")
157+
# Escape application args
158+
save ( ) {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
156161
}
157-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
158-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
162+
APP_ARGS=$(save "$@")
163+
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166+
167+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169+
cd "$(dirname "0ドル")"
170+
fi
159171

160-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
172+
exec "$JAVACMD" "$@"

‎gradlew.bat

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
@rem Set local scope for the variables with windows NT shell
99
if "%OS%"=="Windows_NT" setlocal
1010

11-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12-
set DEFAULT_JVM_OPTS=
13-
1411
set DIRNAME=%~dp0
1512
if "%DIRNAME%" == "" set DIRNAME=.
1613
set APP_BASE_NAME=%~n0
1714
set APP_HOME=%DIRNAME%
1815

16+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17+
set DEFAULT_JVM_OPTS=
18+
1919
@rem Find java.exe
2020
if defined JAVA_HOME goto findJavaFromJavaHome
2121

@@ -46,10 +46,9 @@ echo location of your Java installation.
4646
goto fail
4747

4848
:init
49-
@rem Get command-line arguments, handling Windowz variants
49+
@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)

AltStyle によって変換されたページ (->オリジナル) /