Skip to content

Commit

Permalink
Merge pull request #14 from btrautmann/updates
Browse files Browse the repository at this point in the history
More updates
  • Loading branch information
Brandon Trautmann authored Oct 27, 2018
2 parents 1dd24e2 + 4cec1f8 commit 215dbf2
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 18 deletions.
30 changes: 16 additions & 14 deletions bintray.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ artifacts {
def pomConfig = {
licenses {
license {
name "The Apache Software License, Version 2.0"
url "http://www.apache.org/licenses/LICENSE-2.0.txt"
name licenseName
url licenseUrl
distribution "repo"
}
}
Expand All @@ -53,7 +53,7 @@ def pomConfig = {
}

scm {
url "https://github.com/yourgithubaccount/example"
url "https://github.com/btrautmann/RxFirestore"
}
}

Expand All @@ -72,17 +72,19 @@ publishing {
root.appendNode('name', libraryName)
root.appendNode('url', siteUrl)
root.children().last() + pomConfig
// Iterate over the implementation dependencies (we don't want the test ones), adding a <dependency> node for each
def dependenciesNode = asNode()
configurations.implementation.allDependencies.each {
// Ensure dependencies such as fileTree are not included.
if (it.name != 'unspecified') {
def dependencyNode = dependenciesNode.appendNode('dependency')
dependencyNode.appendNode('groupId', it.group)
dependencyNode.appendNode('artifactId', it.name)
dependencyNode.appendNode('version', it.version)
}
}
// Iterate over the implementation dependencies (we don't want the test ones)
// adding a <dependency> node for each
// TODO: Doing the below breaks the upload process with Invalid POM error
// def dependenciesNode = asNode()
// configurations.implementation.allDependencies.each {
// // Ensure dependencies such as fileTree are not included.
// if (it.name != 'unspecified') {
// def dependencyNode = dependenciesNode.appendNode('dependency')
// dependencyNode.appendNode('groupId', it.group)
// dependencyNode.appendNode('artifactId', it.name)
// dependencyNode.appendNode('version', it.version)
// }
// }
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ext {
// Libraries
supportLibraryVersion = '27.1.1'
firebaseVersion = '17.1.2'
kotlinVersion = '1.2.41'
kotlinVersion = '1.2.71'
rxJavaVersion = '2.2.3'

// Test libraries
Expand All @@ -11,8 +11,8 @@ ext {
junitVersion = '4.12'

// Build plugins
androidPluginVersion = '3.1.2'
bintrayPluginVersion = '1.8.0'
androidPluginVersion = '3.2.0'
bintrayPluginVersion = '1.8.4'
mavenGradlePluginVersion = '2.1'

// Build SDK versions
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

0 comments on commit 215dbf2

Please sign in to comment.