Upgrade to Gradle 4.8 #1350
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| import com.android.build.gradle.BaseExtension | ||
| import com.jfrog.bintray.gradle.BintrayExtension | ||
| import com.jfrog.bintray.gradle.tasks.RecordingCopyTask | ||
| import org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention | ||
| import org.jfrog.gradle.plugin.artifactory.dsl.DoubleDelegateWrapper | ||
| import org.jfrog.gradle.plugin.artifactory.dsl.PublisherConfig | ||
|
|
@@ -52,6 +52,10 @@ allprojects { | |
| } | ||
| } | ||
|
|
||
| tasks.withType<Wrapper> { | ||
| distributionType = Wrapper.DistributionType.ALL | ||
| } | ||
|
|
||
| val Project.configDir get() = "$rootDir/library/quality" | ||
| val Project.reportsDir get() = "$buildDir/reports" | ||
|
|
||
|
|
@@ -247,6 +251,50 @@ fun Project.setupPublishing() { | |
| artifact(sourcesJar) | ||
|
|
||
| pom { | ||
| name.set("FirebaseUI ${project.name.capitalize()}") | ||
| description.set("Firebase UI for Android") | ||
| url.set("https://github.com/firebase/FirebaseUI-Android") | ||
|
|
||
| organization { | ||
| name.set("Firebase") | ||
| url.set("https://github.com/firebase") | ||
| } | ||
|
|
||
| scm { | ||
| val scmUrl = "scm:git:[email protected]/firebase/firebaseui-android.git" | ||
| connection.set(scmUrl) | ||
| developerConnection.set(scmUrl) | ||
| url.set([email protected]) | ||
| tag.set("HEAD") | ||
| } | ||
|
|
||
| developers { | ||
| developer { | ||
| id.set("samtstern") | ||
| name.set("Sam Stern") | ||
| email.set("[email protected]") | ||
| organization.set("Firebase") | ||
| organizationUrl.set("https://firebase.google.com") | ||
| roles.set(listOf("Project-Administrator", "Developer")) | ||
| timezone.set("-8") | ||
| } | ||
|
|
||
| developer { | ||
| id.set("SUPERCILEX") | ||
| name.set("Alex Saveau") | ||
| email.set("[email protected]") | ||
| roles.set(listOf("Developer")) | ||
| timezone.set("-8") | ||
| } | ||
| } | ||
|
|
||
| licenses { | ||
| license { | ||
| name.set("The Apache License, Version 2.0") | ||
| url.set("https://www.apache.org/licenses/LICENSE-2.0.txt") | ||
| } | ||
| } | ||
|
|
||
| withXml { | ||
| asNode().appendNode("dependencies").apply { | ||
| fun Dependency.write(scope: String) = appendNode("dependency").apply { | ||
|
|
@@ -267,54 +315,6 @@ fun Project.setupPublishing() { | |
| dependency.write("runtime") | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -356,16 +356,16 @@ fun Project.setupPublishing() { | |
| "'$name': ${publishing.artifacts}" | ||
| } | ||
| logger.info(""" | ||
| |Bintray configuration for '$publicationName' | ||
| | Artifact name: $artifactName | ||
| | Artifacts: ${publications.joinToString(transform = pubLog)} | ||
| """.trimMargin()) | ||
| logger.info(""" | ||
| |POM transformation | ||
| | Src: $pomSrc | ||
| | Dest: $pomDest | ||
| | Name: $pomName | ||
| """.trimMargin()) | ||
|
|
||
| filesSpec(closureOf<RecordingCopyTask> { | ||
| from(pomSrc) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip | ||
|
There was a problem hiding this comment. So has the issue we had with 4.8 been fixed? There was a problem hiding this comment. Yup, in bintray 1.8.1. |
||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@lsirac If you can send me a developer DSL like this, I'll add you to the list too. 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
BTW @lsirac totally optional, if you don't want to expose your email address or name you can skip.