Skip to content

Commit

Permalink
Fix breaking build for SNAPSHOT users
Browse files Browse the repository at this point in the history
  • Loading branch information
TWiStErRob committed Jan 11, 2016
1 parent 04b8515 commit e91e78f
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
10 changes: 10 additions & 0 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,13 @@ afterEvaluate {
}

apply from: "${rootProject.projectDir}/scripts/upload.gradle"
// exclude <dependency> tag for android support-v4 library from :glide's pom
// this will ensure that this warning will not prevent the build from completing:
// Module 'com.github.bumptech.glide:glide:4.0.0-SNAPSHOT' depends on one or more Android Libraries but is a jar
// most users will need to override support-v4 version anyway if a newer version is available
// TODO make support-v4 a <scope>runtime</scope> dependency in pom.xml
afterEvaluate {
uploadArchives.repositories.mavenDeployer.pom.whenConfigured { p ->
p.dependencies = p.dependencies.findAll { dep -> dep.artifactId != "support-v4" }
}
}
5 changes: 5 additions & 0 deletions scripts/upload.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ afterEvaluate { project ->
uploadArchives {
repositories {
mavenDeployer {
// allow uploading through FTP protocol with the following command:
// gradle uploadArchives -PSNAPSHOT_REPOSITORY_URL=ftp://host/repo/path -PUSERNAME=uname -PPASSWORD=passwd
configuration = configurations.create('deployerJars')
configuration.dependencies.add dependencies.create('org.apache.maven.wagon:wagon-ftp:2.2')

beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }

pom.groupId = GROUP
Expand Down
2 changes: 1 addition & 1 deletion third_party/gif_decoder/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
apply plugin: 'org.robolectric'

dependencies {
compile "com.android.support:support-v4:${SUPPORT_V4_VERSION}"
compile "com.android.support:support-annotations:${SUPPORT_V4_VERSION}"

testCompile project(':testutil')
testCompile "com.android.support:support-v4:${SUPPORT_V4_VERSION}"
Expand Down

0 comments on commit e91e78f

Please sign in to comment.