Skip to content

fix: Change project configuration logic #894

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

Closed
barbeau wants to merge 1 commit into from
Closed

fix: Change project configuration logic #894

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
173 changes: 87 additions & 86 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ allprojects {
}
}

task clean(type: Delete) {
delete rootProject.buildDir
}

/**
* Improve build server performance by allowing disabling of pre-dexing
* (see http://tools.android.com/tech-docs/new-build-system/tips#TOC-Improving-Build-Server-performance.)
Expand Down Expand Up @@ -122,107 +118,112 @@ allprojects {
* Publishing and signing info
*/
subprojects { project ->
if (project.ext.artifactId == null) return

apply plugin: 'com.android.library'
apply plugin: 'com.hiya.jacoco-android'
apply plugin: 'maven-publish'
apply plugin: 'signing'

// Code coverage
jacoco {
toolVersion = "0.8.4"
}

tasks.withType(Test) {
jacoco.includeNoLocationClasses = true
jacoco.excludes = ['jdk.internal.*']
}
project.plugins.withId('com.android.library') {
if (project.ext.artifactId == null) return

// FIXME > Failed to apply plugin [id 'com.hiya.jacoco-android']
// > You must apply the Android plugin or the Android library plugin before using the jacoco-android plugin
//apply plugin: 'com.hiya.jacoco-android'
apply plugin: 'maven-publish'
apply plugin: 'signing'

// Code coverage
// jacoco {
// toolVersion = "0.8.4"
// }
//
// tasks.withType(Test) {
// jacoco.includeNoLocationClasses = true
// jacoco.excludes = ['jdk.internal.*']
// }

task javadoc(type: Javadoc) {
failOnError false
source = android.sourceSets.main.java.srcDirs
}

task javadoc(type: Javadoc) {
failOnError false
source = android.sourceSets.main.java.srcDirs
}
task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
}

task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
}
task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
}
publishing {
publications {
aar(MavenPublication) {
groupId project.group
artifactId project.ext.artifactId
version project.version

pom {
name = project.ext.artifactId
description = 'Handy extensions to the Google Maps Android API.'
url = 'https://github.com/googlemaps/android-maps-utils'

scm {
url = 'scm:git@github.com:googlemaps/android-maps-utils.git'
connection = 'scm:git@github.com:googlemaps/android-maps-utils.git'
developerConnection = 'scm:git@github.com:googlemaps/android-maps-utils.git'
}

publishing {
publications {
aar(MavenPublication) {
groupId project.group
artifactId project.ext.artifactId
version project.version

pom {
name = project.ext.artifactId
description = 'Handy extensions to the Google Maps Android API.'
url = 'https://github.com/googlemaps/android-maps-utils'

scm {
url = 'scm:git@github.com:googlemaps/android-maps-utils.git'
connection = 'scm:git@github.com:googlemaps/android-maps-utils.git'
developerConnection = 'scm:git@github.com:googlemaps/android-maps-utils.git'
}
licenses {
license {
name = 'The Apache Software License, Version 2.0'
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
distribution = 'repo'
}
}

licenses {
license {
name = 'The Apache Software License, Version 2.0'
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
distribution = 'repo'
organization {
name = 'Google Inc'
url = 'http://developers.google.com/maps'
}
}

organization {
name = 'Google Inc'
url = 'http://developers.google.com/maps'
developers {
developer {
name = 'Google Inc.'
}
}
}

developers {
developer {
name = 'Google Inc.'
pom.withXml {
def dependenciesNode = asNode().appendNode('dependencies')
project.configurations.api.allDependencies.each { dependency ->
def dependencyNode = dependenciesNode.appendNode('dependency')
dependencyNode.appendNode('groupId', dependency.group)
dependencyNode.appendNode('artifactId', dependency.name)
dependencyNode.appendNode('version', dependency.version)
}
}
}

pom.withXml {
def dependenciesNode = asNode().appendNode('dependencies')
project.configurations.api.allDependencies.each { dependency ->
def dependencyNode = dependenciesNode.appendNode('dependency')
dependencyNode.appendNode('groupId', dependency.group)
dependencyNode.appendNode('artifactId', dependency.name)
dependencyNode.appendNode('version', dependency.version)
afterEvaluate {
artifact "$buildDir/outputs/aar/$project.name-release.aar"
artifact sourcesJar
artifact javadocJar
}
}

afterEvaluate {
artifact "$buildDir/outputs/aar/$project.name-release.aar"
artifact sourcesJar
artifact javadocJar
}
}
}

repositories {
maven {
name = "mavencentral"
url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
credentials {
username sonatypeUsername
password sonatypePassword
repositories {
maven {
name = "mavencentral"
url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
credentials {
username sonatypeUsername
password sonatypePassword
}
}
}
}
}

signing {
sign publishing.publications.aar
// FIXME - Failed to apply plugin [id 'com.android.library']
// > Cannot add task 'signAarPublication' as a task with that name already exists.
// signing {
// sign publishing.publications.aar
// }
}
}
1 change: 1 addition & 0 deletions library-v3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
* Vestibulum commodo. Ut rhoncus gravida arcu.
*/
apply plugin: 'com.android.library'

android {
compileSdkVersion 29
Expand Down
2 changes: 2 additions & 0 deletions library/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* limitations under the License.
*/

apply plugin: 'com.android.library'

android {
dexOptions {
javaMaxHeapSize "2g"
Expand Down