diff --git a/build.gradle b/build.gradle index 69192e9b..ecc23fde 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:2.2.2' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' - + classpath "org.jfrog.buildinfo:build-info-extractor-gradle:3.1.1" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/downloadutil/build.gradle b/downloadutil/build.gradle index fa424399..68eb9ad5 100644 --- a/downloadutil/build.gradle +++ b/downloadutil/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' - -group='com.github.AriaLyy' +//apply plugin: 'com.github.dcendents.android-maven' +// +//group='com.github.AriaLyy' android { compileSdkVersion 23 @@ -27,58 +27,59 @@ dependencies { testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:23.1.1' } +//apply from: 'jcenter.gradle' // build a jar with source files -task sourcesJar(type: Jar) { - from android.sourceSets.main.java.srcDirs - classifier = 'sources' -} - -task javadoc(type: Javadoc) { - failOnError false - source = android.sourceSets.main.java.sourceFiles - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - classpath += configurations.compile -} - -// build a jar with javadoc -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -android.libraryVariants.all { variant -> - println variant.javaCompile.classpath.files - if (variant.name == 'release') { - //我们只需 release 的 javadoc - task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) { - // title = '' - // description = '' - source = variant.javaCompile.source - classpath = files(variant.javaCompile.classpath.files, project.android.getBootClasspath()) - options { - encoding "utf-8" - links "http://docs.oracle.com/javase/7/docs/api/" - linksOffline "http://d.android.com/reference", "${android.sdkDirectory}/docs/reference" - } - exclude '**/BuildConfig.java' - exclude '**/R.java' - } - task("javadoc${variant.name.capitalize()}Jar", type: Jar, - dependsOn: "generate${variant.name.capitalize()}Javadoc") { - classifier = 'javadoc' - from tasks.getByName("generate${variant.name.capitalize()}Javadoc").destinationDir - } - artifacts { - archives tasks.getByName("javadoc${variant.name.capitalize()}Jar") - } - } -} - -artifacts { - archives sourcesJar - archives javadocJar -} +//task sourcesJar(type: Jar) { +// from android.sourceSets.main.java.srcDirs +// classifier = 'sources' +//} +// +//task javadoc(type: Javadoc) { +// failOnError false +// source = android.sourceSets.main.java.sourceFiles +// classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) +// classpath += configurations.compile +//} +// +//// build a jar with javadoc +//task javadocJar(type: Jar, dependsOn: javadoc) { +// classifier = 'javadoc' +// from javadoc.destinationDir +//} +// +//android.libraryVariants.all { variant -> +// println variant.javaCompile.classpath.files +// if (variant.name == 'release') { +// //我们只需 release 的 javadoc +// task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) { +// // title = '' +// // description = '' +// source = variant.javaCompile.source +// classpath = files(variant.javaCompile.classpath.files, project.android.getBootClasspath()) +// options { +// encoding "utf-8" +// links "http://docs.oracle.com/javase/7/docs/api/" +// linksOffline "http://d.android.com/reference", "${android.sdkDirectory}/docs/reference" +// } +// exclude '**/BuildConfig.java' +// exclude '**/R.java' +// } +// task("javadoc${variant.name.capitalize()}Jar", type: Jar, +// dependsOn: "generate${variant.name.capitalize()}Javadoc") { +// classifier = 'javadoc' +// from tasks.getByName("generate${variant.name.capitalize()}Javadoc").destinationDir +// } +// artifacts { +// archives tasks.getByName("javadoc${variant.name.capitalize()}Jar") +// } +// } +//} +// +//artifacts { +// archives sourcesJar +// archives javadocJar +//} //apply frome: 'build_source.gradle' //apply from: 'jcenter.gradle' \ No newline at end of file diff --git a/downloadutil/jcenter.gradle b/downloadutil/jcenter.gradle index 3d3197d1..4963caec 100644 --- a/downloadutil/jcenter.gradle +++ b/downloadutil/jcenter.gradle @@ -2,8 +2,9 @@ group = PROJ_GROUP version = PROJ_VERSION project.archivesBaseName = PROJ_ARTIFACTID apply plugin: 'com.jfrog.bintray' -apply plugin: "com.jfrog.artifactory" -apply plugin: 'maven-publish' +apply plugin: 'com.github.dcendents.android-maven' +//apply plugin: "com.jfrog.artifactory" +//apply plugin: 'maven-publish' task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs @@ -72,59 +73,59 @@ artifacts { } -def pomConfig = { - scm { - connection PROJ_VCSURL - developerConnection PROJ_VCSURL - url PROJ_WEBSITEURL - } - licenses { - license { - name "The Apache Software License, Version 2.0" - url "http://www.apache.org/licenses/LICENSE-2.0.txt" - distribution "repo" - } - } - developers { - developer { - id DEVELOPER_ID - name DEVELOPER_NAME - email DEVELOPER_EMAIL - } - } - "dependencies " { - // dependency { - // groupId "com.alibaba" - // artifactId "fastjson" - // "version " "1.2.6" - // //同dependencies - // } - // } - } -} - -publishing { - publications { - mavenJava(MavenPublication) { - artifactId PROJ_ARTIFACTID - artifact javadocJar - artifact sourcesJar - - pom { - packaging 'aar' - } - pom.withXml { - def root = asNode() - root.appendNode('description', PROJ_DESCRIPTION) - root.children().last() + pomConfig - } - } - } -} - -afterEvaluate { - publishing.publications.mavenJava.artifact(bundleRelease) -} +//def pomConfig = { +// scm { +// connection PROJ_VCSURL +// developerConnection PROJ_VCSURL +// url PROJ_WEBSITEURL +// } +// licenses { +// license { +// name "The Apache Software License, Version 2.0" +// url "http://www.apache.org/licenses/LICENSE-2.0.txt" +// distribution "repo" +// } +// } +// developers { +// developer { +// id DEVELOPER_ID +// name DEVELOPER_NAME +// email DEVELOPER_EMAIL +// } +// } +// "dependencies " { +// // dependency { +// // groupId "com.alibaba" +// // artifactId "fastjson" +// // "version " "1.2.6" +// // //同dependencies +// // } +// // } +// } +//} +// +//publishing { +// publications { +// mavenJava(MavenPublication) { +// artifactId PROJ_ARTIFACTID +// artifact javadocJar +// artifact sourcesJar +// +// pom { +// packaging 'aar' +// } +// pom.withXml { +// def root = asNode() +// root.appendNode('description', PROJ_DESCRIPTION) +// root.children().last() + pomConfig +// } +// } +// } +//} +// +//afterEvaluate { +// publishing.publications.mavenJava.artifact(bundleRelease) +//} bintray { user = hasProperty("bintrayUser") ? getProperty("bintrayUser") : getProperty("BINTRAY_USER")