diff --git a/framework/build.gradle b/framework/build.gradle index 8fcf4b59..05b0f7ae 100644 --- a/framework/build.gradle +++ b/framework/build.gradle @@ -75,10 +75,16 @@ android { exclude 'META-INF/DEPENDENCIES' exclude 'META-INF/NOTICE' } + + publishing { + singleVariant('release') { + withSourcesJar() + } + } } dependencies { - implementation "androidx.appcompat:appcompat:${cordovaConfig.ANDROIDX_APP_COMPAT_VERSION}" + api "androidx.appcompat:appcompat:${cordovaConfig.ANDROIDX_APP_COMPAT_VERSION}" implementation "androidx.webkit:webkit:${cordovaConfig.ANDROIDX_WEBKIT_VERSION}" implementation "androidx.core:core-splashscreen:${cordovaConfig.ANDROIDX_CORE_SPLASHSCREEN_VERSION}" } diff --git a/framework/cordova-publish.gradle b/framework/cordova-publish.gradle index 30d9e4e0..99163cc2 100644 --- a/framework/cordova-publish.gradle +++ b/framework/cordova-publish.gradle @@ -46,73 +46,69 @@ if (project.hasProperty('signEnabled')) { } } -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} +afterEvaluate { + publishing { + publications { + mavenJava(MavenPublication) { + groupId = 'org.apache.cordova' + artifactId = 'framework' + version = getCordovaAndroidVersion() -publishing { - publications { - mavenJava(MavenPublication) { - groupId = 'org.apache.cordova' - artifactId = 'framework' - version = getCordovaAndroidVersion() + from components.release - artifact(sourcesJar) - artifact("$buildDir/outputs/aar/framework-release.aar") + pom { + name = 'Cordova' + description = 'A library to build Cordova-based projects for the Android platform.' + url = 'https://cordova.apache.org' - pom { - name = 'Cordova' - description = 'A library to build Cordova-based projects for the Android platform.' - url = 'https://cordova.apache.org' - - licenses { - license { - name = 'Apache License, Version 2.0' - url = 'https://www.apache.org/licenses/LICENSE-2.0.txt' + licenses { + license { + name = 'Apache License, Version 2.0' + url = 'https://www.apache.org/licenses/LICENSE-2.0.txt' + } } - } - developers { - developer { - id = 'stevengill' - name = 'Steve Gill' + developers { + developer { + id = 'stevengill' + name = 'Steve Gill' + } + developer { + id = 'erisu' + name = 'Bryan Ellis' + email = 'erisu@apache.org' + } } - developer { - id = 'erisu' - name = 'Bryan Ellis' - email = 'erisu@apache.org' - } - } - scm { - connection = 'scm:git:https://github.com/apache/cordova-android.git' - developerConnection = 'scm:git:git@github.com:apache/cordova-android.git' - url = 'https://github.com/apache/cordova-android' + scm { + connection = 'scm:git:https://github.com/apache/cordova-android.git' + developerConnection = 'scm:git:git@github.com:apache/cordova-android.git' + url = 'https://github.com/apache/cordova-android' + } } } } - } - repositories { - maven { - def releasesRepoUrl = 'https://repository.apache.org/content/repositories/releases' - def snapshotsRepoUrl = 'https://repository.apache.org/content/repositories/snapshots' + repositories { + maven { + def releasesRepoUrl = 'https://repository.apache.org/content/repositories/releases' + def snapshotsRepoUrl = 'https://repository.apache.org/content/repositories/snapshots' - url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl + url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl - credentials { - if (project.hasProperty('apacheUsername') && project.hasProperty('apachePassword')) { - username apacheUsername - password apachePassword + credentials { + if (project.hasProperty('apacheUsername') && project.hasProperty('apachePassword')) { + username apacheUsername + password apachePassword + } } } } - } - signing { - if (Boolean.valueOf(cdvEnableSigning)) { - sign publishing.publications.mavenJava + signing { + if (Boolean.valueOf(cdvEnableSigning)) { + sign publishing.publications.mavenJava + } } } }