diff --git a/.idea/.name b/.idea/.name index e647688..1106440 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -traccar-client \ No newline at end of file +traccar-client-android \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index aa006ab..7526a36 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,8 +3,14 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 8d0c7fa..5823923 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,11 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + localhost + 5050 + + diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 9d32e50..def6a6a 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,7 +2,6 @@ - diff --git a/build.gradle b/build.gradle index 495c503..6b42096 100644 --- a/build.gradle +++ b/build.gradle @@ -1 +1,16 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.8.+' + } +} + +allprojects { + repositories { + mavenCentral() + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..5d08ba7 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,18 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Settings specified in this file will override any Gradle settings +# configured through the IDE. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# 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 + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8c0fb64..5838598 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a315492..768116c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Oct 28 17:05:17 NZDT 2013 +#Sun Jan 26 19:02:25 NZDT 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip diff --git a/traccar-client-android.iml b/traccar-client-android.iml index 94f1c61..d9c631d 100644 --- a/traccar-client-android.iml +++ b/traccar-client-android.iml @@ -1,5 +1,5 @@ - + diff --git a/traccar-client/build.gradle b/traccar-client/build.gradle index 245b384..3a5253e 100644 --- a/traccar-client/build.gradle +++ b/traccar-client/build.gradle @@ -1,26 +1,36 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:0.6.+' - } -} apply plugin: 'android' -repositories { - mavenCentral() +android { + compileSdkVersion 19 + buildToolsVersion "19.0.1" + + signingConfigs { + release { + storeFile file('/home/user/Documents/android.keystore') + keyAlias "tananaev" + } + } + + buildTypes { + release { + runProguard false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + signingConfig signingConfigs.release + } + } } -android { - compileSdkVersion 17 - buildToolsVersion "17.0.0" - - defaultConfig { - minSdkVersion 3 - targetSdkVersion 18 +tasks.whenTaskAdded { task -> + if (task.name == 'validateReleaseSigning') { + task.dependsOn keystoreInfo } } +task keystoreInfo << { + def password = System.console().readPassword('\n\nKeystore password: ') + android.signingConfigs.release.storePassword = new String(password) + android.signingConfigs.release.keyPassword = new String(password) +} + dependencies { } diff --git a/traccar-client/proguard-rules.txt b/traccar-client/proguard-rules.txt new file mode 100644 index 0000000..f71e0b8 --- /dev/null +++ b/traccar-client/proguard-rules.txt @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /home/user/android-studio/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} \ No newline at end of file diff --git a/traccar-client/traccar-client.iml b/traccar-client/traccar-client.iml index 9c17c90..7c2f6ec 100644 --- a/traccar-client/traccar-client.iml +++ b/traccar-client/traccar-client.iml @@ -1,12 +1,12 @@ - + -