Merge branch 'develop'

imfms · Apr 27, 2017 · ac9396c · ac9396c
2 parents 41546cb + 1da22da
commit ac9396c
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 0 deletions.
diff --git a/simple-runtime-permission-rxjava1/build.gradle b/simple-runtime-permission-rxjava1/build.gradle
@@ -37,3 +37,29 @@ dependencies {
     compile 'io.reactivex:rxjava:1.2.10'
     compile project(':simple-runtime-permission')
 }
+
+tasks.withType(JavaCompile) {
+    options.encoding = "UTF-8"
+}
+
+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
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}
diff --git a/simple-runtime-permission-rxjava2/build.gradle b/simple-runtime-permission-rxjava2/build.gradle
@@ -38,3 +38,29 @@ dependencies {
      */
     compile "io.reactivex.rxjava2:rxjava:2.0.9"
 }
+
+tasks.withType(JavaCompile) {
+    options.encoding = "UTF-8"
+}
+
+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
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}
diff --git a/simple-runtime-permission/build.gradle b/simple-runtime-permission/build.gradle
@@ -31,3 +31,29 @@ dependencies {
     })
     testCompile 'junit:junit:4.12'
 }
+
+tasks.withType(JavaCompile) {
+    options.encoding = "UTF-8"
+}
+
+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
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}