Skip to content
This repository has been archived by the owner on Nov 27, 2018. It is now read-only.

Commit

Permalink
Updated gradle, android and supportlib versions. Replaced apt with an…
Browse files Browse the repository at this point in the history
…notationProcessor
  • Loading branch information
Alexandros Koufatzis authored and Alexandros Koufatzis committed Nov 23, 2016
1 parent 9d0b728 commit de68d45
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 14 deletions.
28 changes: 16 additions & 12 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
apply plugin: 'com.android.application'
apply plugin: 'android-apt'
apply plugin: 'me.tatarka.retrolambda'

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 25
buildToolsVersion "25.0.0"

defaultConfig {
applicationId "com.akoufatzis.weatherapp"
minSdkVersion 17
targetSdkVersion 23
targetSdkVersion 25
versionCode 1
versionName "1.0"

Expand Down Expand Up @@ -39,12 +38,17 @@ android {
}
}

ext {

supportLibVersion = '25.0.1'
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:design:23.4.0'
compile 'com.android.support:support-annotations:23.4.0'
compile 'com.android.support:cardview-v7:23.4.0'
compile "com.android.support:appcompat-v7:$supportLibVersion"
compile "com.android.support:design:$supportLibVersion"
compile "com.android.support:support-annotations:$supportLibVersion"
compile "com.android.support:cardview-v7:$supportLibVersion"
compile 'com.squareup.retrofit2:retrofit:2.0.2'
compile 'com.squareup.retrofit2:converter-gson:2.0.2'
compile 'com.squareup.retrofit2:adapter-rxjava:2.0.2'
Expand All @@ -53,10 +57,10 @@ dependencies {
compile 'io.reactivex:rxandroid:1.1.0'
compile 'io.reactivex:rxjava:1.1.3'
compile 'com.jakewharton:butterknife:8.0.1'
apt 'com.jakewharton:butterknife-compiler:8.0.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.0.1'
compile 'com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.4.0'
compile 'com.jakewharton.rxbinding:rxbinding:0.4.0'
apt 'com.google.dagger:dagger-compiler:2.2'
annotationProcessor 'com.google.dagger:dagger-compiler:2.2'
compile 'com.google.dagger:dagger:2.2'
provided 'javax.annotation:jsr250-api:1.0'

Expand All @@ -65,7 +69,7 @@ dependencies {
testCompile 'org.mockito:mockito-core:1.10.19'
testCompile 'org.hamcrest:hamcrest-all:1.3'

androidTestCompile 'com.android.support:support-annotations:23.4.0'
androidTestCompile "com.android.support:support-annotations:$supportLibVersion"
// Android Testing Support Library's runner and rules
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test:rules:0.5'
Expand All @@ -81,5 +85,5 @@ dependencies {
androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
androidTestCompile 'org.mockito:mockito-core:1.10.19'
androidTestApt 'com.google.dagger:dagger-compiler:2.2'
androidTestAnnotationProcessor 'com.google.dagger:dagger-compiler:2.2'
}
3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'com.android.tools.build:gradle:2.2.2'
classpath 'me.tatarka:gradle-retrolambda:3.2.5'

// NOTE: Do not place your application dependencies here; they belong
Expand Down

0 comments on commit de68d45

Please sign in to comment.