Skip to content

Commit

Permalink
Change tools.build:gradle to 1.1.3 in order to compile.
Browse files Browse the repository at this point in the history
Add proper appcompat versions to use AppCompatActivity.
  • Loading branch information
IgorGanapolsky committed Apr 28, 2015
1 parent 5699cb1 commit 99c39b6
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 49 deletions.
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:1.2.0-beta1'
classpath 'com.android.tools.build:gradle:1.1.3'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
classpath 'org.robolectric:robolectric-gradle-plugin:1.0.1'
}
Expand Down
2 changes: 1 addition & 1 deletion sample-dagger2-rx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dependencies {
compile project(':viewstate')
compile project(':rx')

compile 'com.android.support:recyclerview-v7:22.0.+'
compile 'com.android.support:recyclerview-v7:22.1.1'
compile 'com.android.support:appcompat-v7:' + rootProject.ext.appcompat7Version

apt 'com.hannesdorfmann.annotatedadapter:processor:' + annotatedAdapter
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.hannesdorfmann.mosby.sample.dagger2;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;

import com.hannesdorfmann.mosby.sample.dagger2.repos.ReposFragment;

Expand Down
88 changes: 42 additions & 46 deletions sample-mail/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,69 +2,65 @@ apply plugin: 'com.android.application'
apply plugin: 'com.neenbedankt.android-apt'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion 16
targetSdkVersion rootProject.ext.targetSdk
versionName project.VERSION_NAME
versionCode Integer.parseInt(project.VERSION_CODE)
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion 16
targetSdkVersion rootProject.ext.targetSdk
versionName project.VERSION_NAME
versionCode Integer.parseInt(project.VERSION_CODE)
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}
}


def annotatedAdapter = '1.0.0'
def parcelablePlease ='1.0.1'
def parcelablePlease = '1.0.1'

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:22.0.0'


compile project(':viewstate')
compile project(':rx')

compile 'de.greenrobot:eventbus:2.4.0'

// UI
compile 'com.github.castorflex.smoothprogressbar:library-circular:1.1.0'
compile 'com.rengwuxian.materialedittext:library:2.0.3'
compile 'com.github.jjhesk:hkm-progress-button:0.15'
compile 'de.hdodenhof:circleimageview:1.2.2'
compile 'com.melnykov:floatingactionbutton:1.3.0'
compile 'com.jpardogo.materialtabstrip:library:1.0.9'
compile 'com.github.chenupt:DragTopLayout:1.2.1'
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:22.1.1'

compile 'com.android.support:recyclerview-v7:22.0.+'
compile 'com.android.support:appcompat-v7:' + rootProject.ext.appcompat7Version

apt 'com.hannesdorfmann.annotatedadapter:processor:' + annotatedAdapter
compile 'com.hannesdorfmann.annotatedadapter:annotation:' + annotatedAdapter
compile 'com.hannesdorfmann.annotatedadapter:support-recyclerview:' + annotatedAdapter
compile project(':viewstate')
compile project(':rx')

compile 'de.greenrobot:eventbus:2.4.0'

compile 'com.hannesdorfmann.parcelableplease:annotation:'+parcelablePlease
apt 'com.hannesdorfmann.parcelableplease:processor:'+parcelablePlease
// UI
compile 'com.github.castorflex.smoothprogressbar:library-circular:1.1.0'
compile 'com.rengwuxian.materialedittext:library:2.0.3'
compile 'com.github.jjhesk:hkm-progress-button:0.15'
compile 'de.hdodenhof:circleimageview:1.2.2'
compile 'com.melnykov:floatingactionbutton:1.3.0'
compile 'com.jpardogo.materialtabstrip:library:1.0.9'
compile 'com.github.chenupt:DragTopLayout:1.2.1'

compile 'com.android.support:recyclerview-v7:22.1.1'
compile 'com.android.support:appcompat-v7:' + rootProject.ext.appcompat7Version

apt 'frankiesardo:icepick-processor:3.0.2'
apt 'com.hannesdorfmann.fragmentargs:processor:2.0.1'
compile 'com.google.dagger:dagger:2.0'
apt 'com.google.dagger:dagger-compiler:2.0'
compile 'javax.annotation:javax.annotation-api:1.2'
apt 'com.hannesdorfmann.annotatedadapter:processor:' + annotatedAdapter
compile 'com.hannesdorfmann.annotatedadapter:annotation:' + annotatedAdapter
compile 'com.hannesdorfmann.annotatedadapter:support-recyclerview:' + annotatedAdapter


compile 'com.hannesdorfmann.parcelableplease:annotation:' + parcelablePlease
apt 'com.hannesdorfmann.parcelableplease:processor:' + parcelablePlease


apt 'frankiesardo:icepick-processor:3.0.2'
apt 'com.hannesdorfmann.fragmentargs:processor:2.0.1'
compile 'com.google.dagger:dagger:2.0'
apt 'com.google.dagger:dagger-compiler:2.0'
compile 'javax.annotation:javax.annotation-api:1.2'


testCompile 'junit:junit:4.12'
testCompile 'junit:junit:4.12'
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.hannesdorfmann.mosby.sample.mail.login;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;

import com.hannesdorfmann.mosby.sample.mail.R;

Expand Down
2 changes: 1 addition & 1 deletion sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies {



compile 'com.android.support:recyclerview-v7:22.0.+'
compile 'com.android.support:recyclerview-v7:22.1.1'
compile 'com.android.support:appcompat-v7:'+rootProject.ext.appcompat7Version

apt 'com.hannesdorfmann.annotatedadapter:processor:'+annotatedAdapter
Expand Down

0 comments on commit 99c39b6

Please sign in to comment.