diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 2caec4f..1ee46c8 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,17 +1,18 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 848eb1e..d127c77 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - + diff --git a/build.gradle b/build.gradle index 12cefdc..fe6eb55 100644 --- a/build.gradle +++ b/build.gradle @@ -1,53 +1,53 @@ buildscript { repositories { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.12.2' + classpath 'com.android.tools.build:gradle:1.0.0-rc2' } } apply plugin: 'com.android.application' android { compileSdkVersion 21 buildToolsVersion '21.1.1' compileOptions { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 } packagingOptions { exclude 'META-INF/LICENSE.txt' exclude 'META-INF/NOTICE.txt' } sourceSets { main { manifest.srcFile 'AndroidManifest.xml' java.srcDirs = ['src'] resources.srcDirs = ['src'] aidl.srcDirs = ['src'] renderscript.srcDirs = ['src'] res.srcDirs = ['res'] assets.srcDirs = ['assets'] } } lintOptions { abortOnError false } repositories { mavenCentral() mavenLocal() } dependencies { compile 'com.android.support:support-v4:21.0.+' compile 'com.android.support:appcompat-v7:21.0.+' compile 'com.melnykov:floatingactionbutton:1.1.0' } } \ No newline at end of file diff --git a/bus-torino.iml b/bus-torino.iml index 4c81aab..acd73f6 100644 --- a/bus-torino.iml +++ b/bus-torino.iml @@ -1,86 +1,89 @@ + + + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f7f483b..67ea880 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jan 20 22:06:47 CET 2015 +#Wed Jan 21 17:37:31 CET 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip