Skip to content

Commit

Permalink
updated to sdk 25
Browse files Browse the repository at this point in the history
  • Loading branch information
genshen committed May 22, 2017
1 parent 53e9021 commit 81cb294
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
11 changes: 6 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#.idea
.idea
*.iml
/captures

### Android template
# Built application files
*.apk
Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 81cb294

Please sign in to comment.