From 81cb294b1083622d5602531037eab1ca99ff9bf5 Mon Sep 17 00:00:00 2001 From: genshen Date: Mon, 22 May 2017 15:44:35 +0800 Subject: [PATCH] updated to sdk 25 --- .gitignore | 11 ++++++----- app/build.gradle | 14 +++++++------- build.gradle | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 04023a6..42275d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ -#.idea +.idea *.iml /captures + ### Android template # Built application files *.apk @@ -39,10 +40,10 @@ captures/ # Intellij *.iml #.idea/workspace.xml -#.idea/tasks.xml -#.idea/gradle.xml -#.idea/dictionaries -#.idea/libraries +.idea/tasks.xml +.idea/gradle.xml +.idea/dictionaries +.idea/libraries # Keystore files *.jks diff --git a/app/build.gradle b/app/build.gradle index 24ea0cd..bdc6ddf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,14 +2,14 @@ apply plugin: 'com.android.application' apply plugin: 'android-apt' android { - compileSdkVersion 24 - buildToolsVersion '25.0.0' + compileSdkVersion 25 + buildToolsVersion '25.0.3' useLibrary "org.apache.http.legacy" defaultConfig { applicationId "me.gensh.helloustb" minSdkVersion 16 - targetSdkVersion 24 + targetSdkVersion 25 versionCode 107 versionName "2.0.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -43,10 +43,10 @@ dependencies { }) testCompile 'junit:junit:4.12' apt 'com.github.hotchemi:permissionsdispatcher-processor:2.2.0' - compile 'com.android.support:appcompat-v7:24.2.1' - compile 'com.android.support:design:24.2.1' - compile 'com.android.support:cardview-v7:24.2.1' - compile 'com.android.support:support-v4:24.2.1' + compile 'com.android.support:appcompat-v7:25.3.1' + compile 'com.android.support:design:25.3.1' + compile 'com.android.support:cardview-v7:25.3.1' + compile 'com.android.support:support-v4:25.3.1' compile files('libs/activation.jar') compile files('libs/additionnal.jar') diff --git a/build.gradle b/build.gradle index 9cafb9a..3fb806a 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:2.3.2' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files