From 5edb1fcf4dbbd48d4211cda73c50ef1df5d286b1 Mon Sep 17 00:00:00 2001 From: Lukas Vacek Date: Tue, 19 Apr 2016 22:02:36 +0200 Subject: [PATCH] gradle update --- .idea/.name | 2 +- .idea/compiler.xml | 5 +- .idea/dictionaries/lukas.xml | 7 --- .idea/encodings.xml | 7 ++- .idea/gradle.xml | 12 +++- .idea/inspectionProfiles/Project_Default.xml | 48 --------------- .../inspectionProfiles/profiles_settings.xml | 7 --- .idea/misc.xml | 19 ++++-- .idea/modules.xml | 3 +- .idea/runConfigurations.xml | 12 ++++ .idea/scopes/scope_settings.xml | 5 -- .idea/vcs.xml | 5 +- app/app.iml | 58 ++++++++++--------- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- mockgeofix.iml | 10 ++-- 16 files changed, 84 insertions(+), 122 deletions(-) delete mode 100644 .idea/dictionaries/lukas.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/runConfigurations.xml delete mode 100644 .idea/scopes/scope_settings.xml diff --git a/.idea/.name b/.idea/.name index 0fae226..b49d443 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -mockgeofix +mockgeofix \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 217af47..96cc43e 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,7 +1,6 @@ - - - + \ No newline at end of file diff --git a/.idea/dictionaries/lukas.xml b/.idea/dictionaries/lukas.xml deleted file mode 100644 index 9abf9d4..0000000 --- a/.idea/dictionaries/lukas.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - github - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml index e206d70..97626ba 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 736c7b5..58992cc 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,16 +3,22 @@ - - + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index b1bd0ee..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 3b31283..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 59436c9..1d9d626 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,10 +1,19 @@ - - + + + + + + + + + - + - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 86f8697..0e96d18 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -6,5 +6,4 @@ - - + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b..0000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index c80f219..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,7 +1,6 @@ - + - - + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index 246a0c4..b67f3d7 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ - + @@ -12,9 +12,9 @@ - + @@ -33,13 +33,13 @@ - - - - - - - + + + + + + + @@ -47,6 +47,13 @@ + + + + + + + @@ -61,22 +68,20 @@ + + + + + + + + - - - - - + + - - - - - - - @@ -86,8 +91,7 @@ - + - - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 6356aab..cb98401 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:2.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c71e76..bfa2642 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Tue Apr 19 21:59:47 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip diff --git a/mockgeofix.iml b/mockgeofix.iml index 0bb6048..2bf5465 100644 --- a/mockgeofix.iml +++ b/mockgeofix.iml @@ -1,19 +1,19 @@ - + - + - + - - + \ No newline at end of file