Skip to content

Commit

Permalink
Android: fixed build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Swati4star committed Feb 13, 2017
1 parent 0319152 commit 9c8742f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions Android/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ constants.inc.php
error_log

app/src/main/java/Util/Constants.java
*.hprof
8 changes: 4 additions & 4 deletions Android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 24
buildToolsVersion "24.0.2"
defaultConfig {
applicationId "tie.hackathon.travelguide"
minSdkVersion 19
Expand Down Expand Up @@ -37,8 +37,8 @@ dependencies {

compile 'com.squareup.okhttp3:okhttp:3.4.1'

compile 'com.android.support:appcompat-v7:+'
compile 'com.android.support:design:+'
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:design:23.1.1'

compile 'de.hdodenhof:circleimageview:2.0.0'
compile 'com.github.ParkSangGwon:TedPicker:v1.0.10'
Expand Down
2 changes: 2 additions & 0 deletions Android/app/src/main/java/Util/GPSTracker.java
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ private Location getLocation() {
e.printStackTrace();
}

return location;

}

@Override
Expand Down
2 changes: 1 addition & 1 deletion Android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand Down

0 comments on commit 9c8742f

Please sign in to comment.