Skip to content

Commit

Permalink
Fix issue #21
Browse files Browse the repository at this point in the history
- Update gradle files
- Remove ic_launcher
  • Loading branch information
jpardogo committed May 21, 2015
1 parent be464c2 commit 54588c7
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 13 deletions.
5 changes: 2 additions & 3 deletions build.gradle
Expand Up @@ -4,11 +4,10 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath 'com.android.tools.build:gradle:1.2.3'
}
}


allprojects {
version = VERSION_NAME
group = GROUP
Expand All @@ -19,5 +18,5 @@ allprojects {
}

ext.libraries = [
android_support: 'com.android.support:support-v4:+'
android_support: 'com.android.support:support-v4:22.1.1'
]
8 changes: 4 additions & 4 deletions example/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'android'
apply plugin: 'com.android.application'

repositories {
mavenCentral()
}

android {

compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION

defaultConfig {
Expand All @@ -32,10 +32,10 @@ android {
}

dependencies {
compile 'com.android.support:appcompat-v7:21.0.3'
compile 'com.jakewharton:butterknife:5.0.1'
compile project(':library')
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:22.1.1'
compile 'com.jakewharton:butterknife:6.1.0'
}

File propFile = file('signing.properties');
Expand Down
5 changes: 2 additions & 3 deletions gradle.properties
Expand Up @@ -13,8 +13,7 @@ POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=jpardogo1
POM_DEVELOPER_NAME=Javier Pardo

ANDROID_BUILD_SDK_VERSION=21
ANDROID_BUILD_TARGET_SDK_VERSION=21
ANDROID_BUILD_TARGET_SDK_VERSION=22
ANDROID_BUILD_MIN_SDK_VERSION=11
ANDROID_BUILD_TOOLS_VERSION=21.1.2
ANDROID_BUILD_TOOLS_VERSION=22.0.1
ABORT_ON_ERROR=false
6 changes: 3 additions & 3 deletions library/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'android-library'
apply plugin: 'com.android.library'

android {
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION

defaultConfig {
Expand All @@ -19,4 +19,4 @@ android {
}
}

apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
apply from: 'https://raw.githubusercontent.com/jpardogo/gradle-mvn-push/master/gradle-mvn-push.gradle'
Binary file removed library/src/main/res/drawable-hdpi/ic_launcher.png
Binary file not shown.
Binary file removed library/src/main/res/drawable-mdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file removed library/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary file not shown.

0 comments on commit 54588c7

Please sign in to comment.