Skip to content

Commit 71ce8b0

Browse files
committed
Cleaning up application code
1 parent 1b25d5e commit 71ce8b0

File tree

8 files changed

+139
-230
lines changed

8 files changed

+139
-230
lines changed

.gitignore

Lines changed: 45 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,53 @@
1-
*/target
2-
target
3-
build
4-
tmp
1+
# built application files
2+
*.apk
3+
*.ap_
4+
5+
# files for the dex VM
6+
*.dex
7+
8+
# Java class files
9+
*.class
10+
classes/
11+
12+
# generated files
13+
bin/
14+
gen/
15+
16+
# Local configuration file (sdk path, etc)
17+
local.properties
18+
19+
# Eclipse project files
20+
.classpath
21+
.project
22+
23+
# Proguard folder generated by Eclipse
24+
proguard/
25+
26+
# Intellij project files
27+
*.iml
28+
*.ipr
29+
*.iws
30+
.idea/
31+
32+
# Apple
33+
.DS_Store
34+
35+
# Vim/Emacs
536
*~
37+
38+
# Maven
39+
target/
40+
41+
# Gradle
42+
.gradle
43+
build
44+
45+
# Custom
646
lib
7-
bin
847
*/test-output
948
temp-testng-customsuite.xml
1049
**pom.xml.releaseBackup
1150
release.properties
1251
project.properties
13-
*.iws
14-
*.iml
15-
gen
1652
*/seed.txt
17-
notes
18-
logs
19-
gen-external-apklibs
20-
.idea
21-
out
22-
.DS_Store
23-
classes
24-
.gradle
25-
app/.project
26-
app/.classpath
27-
app/.settings/
28-
.settings/
53+
gen-external-apklibs

app/.classpath

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

app/.project

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

app/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<uses-sdk
99
android:minSdkVersion="8"
10-
android:targetSdkVersion="16" />
10+
android:targetSdkVersion="18" />
1111

1212
<uses-permission android:name="android.permission.INTERNET" />
1313
<uses-permission android:name="android.permission.GET_ACCOUNTS" />

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
mavenCentral()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:0.5.+'
8+
classpath 'com.android.tools.build:gradle:0.6.+'
99
}
1010
}
1111
apply plugin: 'android'

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip

gradlew

Lines changed: 90 additions & 164 deletions
Original file line numberDiff line numberDiff line change
@@ -1,164 +1,90 @@
1-
#!/usr/bin/env bash
2-
3-
##############################################################################
4-
##
5-
## Gradle start up script for UN*X
6-
##
7-
##############################################################################
8-
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=""
11-
12-
APP_NAME="Gradle"
13-
APP_BASE_NAME=`basename "$0"`
14-
15-
# Use the maximum available, or set MAX_FD != -1 to use that value.
16-
MAX_FD="maximum"
17-
18-
warn ( ) {
19-
echo "$*"
20-
}
21-
22-
die ( ) {
23-
echo
24-
echo "$*"
25-
echo
26-
exit 1
27-
}
28-
29-
# OS specific support (must be 'true' or 'false').
30-
cygwin=false
31-
msys=false
32-
darwin=false
33-
case "`uname`" in
34-
CYGWIN* )
35-
cygwin=true
36-
;;
37-
Darwin* )
38-
darwin=true
39-
;;
40-
MINGW* )
41-
msys=true
42-
;;
43-
esac
44-
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-
50-
# Attempt to set APP_HOME
51-
# Resolve links: $0 may be a link
52-
PRG="$0"
53-
# Need this for relative symlinks.
54-
while [ -h "$PRG" ] ; do
55-
ls=`ls -ld "$PRG"`
56-
link=`expr "$ls" : '.*-> \(.*\)$'`
57-
if expr "$link" : '/.*' > /dev/null; then
58-
PRG="$link"
59-
else
60-
PRG=`dirname "$PRG"`"/$link"
61-
fi
62-
done
63-
SAVED="`pwd`"
64-
cd "`dirname \"$PRG\"`/" >&-
65-
APP_HOME="`pwd -P`"
66-
cd "$SAVED" >&-
67-
68-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
69-
70-
# Determine the Java command to use to start the JVM.
71-
if [ -n "$JAVA_HOME" ] ; then
72-
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
73-
# IBM's JDK on AIX uses strange locations for the executables
74-
JAVACMD="$JAVA_HOME/jre/sh/java"
75-
else
76-
JAVACMD="$JAVA_HOME/bin/java"
77-
fi
78-
if [ ! -x "$JAVACMD" ] ; then
79-
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
80-
81-
Please set the JAVA_HOME variable in your environment to match the
82-
location of your Java installation."
83-
fi
84-
else
85-
JAVACMD="java"
86-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
87-
88-
Please set the JAVA_HOME variable in your environment to match the
89-
location of your Java installation."
90-
fi
91-
92-
# Increase the maximum file descriptors if we can.
93-
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
94-
MAX_FD_LIMIT=`ulimit -H -n`
95-
if [ $? -eq 0 ] ; then
96-
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
97-
MAX_FD="$MAX_FD_LIMIT"
98-
fi
99-
ulimit -n $MAX_FD
100-
if [ $? -ne 0 ] ; then
101-
warn "Could not set maximum file descriptor limit: $MAX_FD"
102-
fi
103-
else
104-
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
105-
fi
106-
fi
107-
108-
# For Darwin, add options to specify how the application appears in the dock
109-
if $darwin; then
110-
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
111-
fi
112-
113-
# For Cygwin, switch paths to Windows format before running java
114-
if $cygwin ; then
115-
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116-
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
117-
118-
# We build the pattern for arguments to be converted via cygpath
119-
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
120-
SEP=""
121-
for dir in $ROOTDIRSRAW ; do
122-
ROOTDIRS="$ROOTDIRS$SEP$dir"
123-
SEP="|"
124-
done
125-
OURCYGPATTERN="(^($ROOTDIRS))"
126-
# Add a user-defined pattern to the cygpath arguments
127-
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
128-
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
129-
fi
130-
# Now convert the arguments - kludge to limit ourselves to /bin/sh
131-
i=0
132-
for arg in "$@" ; do
133-
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
134-
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
135-
136-
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
137-
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
138-
else
139-
eval `echo args$i`="\"$arg\""
140-
fi
141-
i=$((i+1))
142-
done
143-
case $i in
144-
(0) set -- ;;
145-
(1) set -- "$args0" ;;
146-
(2) set -- "$args0" "$args1" ;;
147-
(3) set -- "$args0" "$args1" "$args2" ;;
148-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154-
esac
155-
fi
156-
157-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158-
function splitJvmOpts() {
159-
JVM_OPTS=("$@")
160-
}
161-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
163-
164-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
1+
@if "%DEBUG%" == "" @echo off
2+
@rem ##########################################################################
3+
@rem
4+
@rem Gradle startup script for Windows
5+
@rem
6+
@rem ##########################################################################
7+
8+
@rem Set local scope for the variables with windows NT shell
9+
if "%OS%"=="Windows_NT" setlocal
10+
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+
14+
set DIRNAME=%~dp0
15+
if "%DIRNAME%" == "" set DIRNAME=.
16+
set APP_BASE_NAME=%~n0
17+
set APP_HOME=%DIRNAME%
18+
19+
@rem Find java.exe
20+
if defined JAVA_HOME goto findJavaFromJavaHome
21+
22+
set JAVA_EXE=java.exe
23+
%JAVA_EXE% -version >NUL 2>&1
24+
if "%ERRORLEVEL%" == "0" goto init
25+
26+
echo.
27+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28+
echo.
29+
echo Please set the JAVA_HOME variable in your environment to match the
30+
echo location of your Java installation.
31+
32+
goto fail
33+
34+
:findJavaFromJavaHome
35+
set JAVA_HOME=%JAVA_HOME:"=%
36+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37+
38+
if exist "%JAVA_EXE%" goto init
39+
40+
echo.
41+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42+
echo.
43+
echo Please set the JAVA_HOME variable in your environment to match the
44+
echo location of your Java installation.
45+
46+
goto fail
47+
48+
:init
49+
@rem Get command-line arguments, handling Windowz variants
50+
51+
if not "%OS%" == "Windows_NT" goto win9xME_args
52+
if "%@eval[2+2]" == "4" goto 4NT_args
53+
54+
:win9xME_args
55+
@rem Slurp the command line arguments.
56+
set CMD_LINE_ARGS=
57+
set _SKIP=2
58+
59+
:win9xME_args_slurp
60+
if "x%~1" == "x" goto execute
61+
62+
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=%$
68+
69+
:execute
70+
@rem Setup the command line
71+
72+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
74+
@rem Execute Gradle
75+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
76+
77+
:end
78+
@rem End local scope for the variables with windows NT shell
79+
if "%ERRORLEVEL%"=="0" goto mainEnd
80+
81+
:fail
82+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
83+
rem the _cmd.exe /c_ return code!
84+
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
85+
exit /b 1
86+
87+
:mainEnd
88+
if "%OS%"=="Windows_NT" endlocal
89+
90+
:omega

0 commit comments

Comments
 (0)