diff --git a/.idea/misc.xml b/.idea/misc.xml index cca2cdae..a1cf3e45 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -27,17 +27,7 @@ - - - - - - - - - - - + @@ -59,4 +49,4 @@ - \ No newline at end of file + diff --git a/app/build.gradle b/app/build.gradle index e200e45c..00163210 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 26 - buildToolsVersion '26.0.1' + buildToolsVersion '26.0.2' defaultConfig { applicationId "org.shadowice.flocke.andotp" @@ -29,10 +29,10 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'de.psdev.licensesdialog:licensesdialog:1.8.3' - compile 'com.android.support:appcompat-v7:26.0.1' - compile 'com.android.support:design:26.0.1' - compile 'com.android.support:recyclerview-v7:26.0.1' - compile 'com.android.support:cardview-v7:26.0.1' + compile 'com.android.support:appcompat-v7:26.1.0' + compile 'com.android.support:design:26.1.0' + compile 'com.android.support:recyclerview-v7:26.1.0' + compile 'com.android.support:cardview-v7:26.1.0' compile 'com.android.support.constraint:constraint-layout:1.0.2' compile 'com.journeyapps:zxing-android-embedded:3.5.0' compile 'commons-codec:commons-codec:1.10' diff --git a/build.gradle b/build.gradle index 428e3434..16f40d22 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.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 ae77f3f1..6ffd5ff1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jun 28 10:02:10 CEST 2017 +#Thu Oct 26 07:40:01 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip