Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to gradle 2.2.1 and support v22 / build tools v22.0.1 #436

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to gradle 2.2.1 and support v22 / build tools v22.0.1 #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:0.13.+'
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
classpath 'com.android.tools.build:gradle:1.1.0'
}
}

Expand Down
1 change: 0 additions & 1 deletion demo/extras/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.application'

repositories {
Expand Down
1 change: 0 additions & 1 deletion demo/stock/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.application'

repositories {
Expand Down
1 change: 0 additions & 1 deletion extra/extra-dragdrop/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.library'

repositories {
Expand Down
1 change: 0 additions & 1 deletion extra/extra-staggeredgrid/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.library'

repositories {
Expand Down
1 change: 0 additions & 1 deletion extra/extra-twoway/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.library'

repositories {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Oct 21 12:46:26 CEST 2014
#Mon Dec 22 09:48:08 CST 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-all.zip
1 change: 0 additions & 1 deletion library-cards/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.library'

repositories {
Expand Down
9 changes: 4 additions & 5 deletions library-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.library'

repositories {
Expand All @@ -11,7 +10,7 @@ android {

defaultConfig {
minSdkVersion 14
targetSdkVersion 21
targetSdkVersion 22
versionName project.VERSION_NAME
versionCode Integer.parseInt(project.VERSION_CODE)
}
Expand All @@ -24,13 +23,13 @@ android {

dependencies {
//CardView
compile 'com.android.support:cardview-v7:21.0.0'
compile 'com.android.support:cardview-v7:22.0.0'

//Support lib
compile 'com.android.support:support-v4:21.0.0'
compile 'com.android.support:support-v4:22.0.0'

//Annotation
compile 'com.android.support:support-annotations:21.0.0'
compile 'com.android.support:support-annotations:22.0.0'
}

// Used to update in Maven
Expand Down
1 change: 0 additions & 1 deletion library-recyclerview/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.library'

repositories {
Expand Down