diff --git a/build.gradle b/build.gradle index 049b9fe4..82ef8a1d 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ allprojects { options { encoding "UTF-8" charSet 'UTF-8' - links "http://docs.oracle.com/javase/7/docs/api" + // links "https://docs.oracle.com/javase/8/docs/api/" } } } diff --git a/gradle/mavenCentral-release.gradle b/gradle/mavenCentral-release.gradle index ea941573..c71c7992 100644 --- a/gradle/mavenCentral-release.gradle +++ b/gradle/mavenCentral-release.gradle @@ -25,16 +25,16 @@ tasks.withType(Javadoc) { options { encoding "UTF-8" charSet 'UTF-8' - links "http://docs.oracle.com/javase/7/docs/api" + // links "https://docs.oracle.com/javase/8/docs/api/" addStringOption('Xdoclint:none', '-quiet') // 忽略检查@params 和 @return } } -ext["signing.keyId"] = '' -ext["signing.password"] = '' -ext["signing.secretKeyRingFile"] = '' -ext["ossrhUsername"] = '' -ext["ossrhPassword"] = '' +ext["signing.keyId"] = null +ext["signing.password"] = null +ext["signing.secretKeyRingFile"] = null +ext["ossrhUsername"] = null +ext["ossrhPassword"] = null File secretPropsFile = project.rootProject.file('local.properties') if (secretPropsFile.exists()) { @@ -65,7 +65,7 @@ def getSnapshotRepositoryUrl() { } def isLocal() { - return ISLOCAL == 'true' + return project.findProperty('ISLOCAL') == 'true' } afterEvaluate { project -> @@ -113,12 +113,11 @@ afterEvaluate { project -> project.file("build/intermediates/classes/debug") ) doFirst { - classpath += project.files(variants.collect { it.javaCompile.classpath.files }) + classpath += project.files(variants.collect { it.javaCompileProvider.get().classpath.files }) } options { - links("http://docs.oracle.com/javase/7/docs/api/") - linksOffline("http://d.android.com/reference", - "${getAndroidSdkDirectory}/docs/reference") + // links("https://docs.oracle.com/javase/8/docs/api/") + // linksOffline("http://d.android.com/reference", "${getAndroidSdkDirectory}/docs/reference") encoding "UTF-8" charSet 'UTF-8' addStringOption('Xdoclint:none', '-quiet') // 忽略检查@params 和 @return @@ -135,13 +134,13 @@ afterEvaluate { project -> def androidJavadocsJar = project.task("androidJavadocsJar", type: Jar, dependsOn: androidJavadocs) { archiveClassifier = 'javadoc' - archiveBaseName = "${JAR_PREFIX}${project.name}" + archiveBaseName = "${JAR_PREFIX}${project.PUBLISH_ARTIFACT_ID}" } def androidSourcesJar = project.task("androidSourcesJar", type: Jar) { archiveClassifier = 'sources' from project.android.sourceSets.main.java.source - archiveBaseName = "${JAR_PREFIX}${project.name}" + archiveBaseName = "${JAR_PREFIX}${project.PUBLISH_ARTIFACT_ID}" exclude "**/R.class" exclude "**/BuildConfig.class" @@ -231,6 +230,7 @@ afterEvaluate { project -> } } signing { + required { !isLocal() && project.findProperty("signing.keyId") } sign publishing.publications } }