Merge branch 'master' of https://git.frostnerd.com/AndroidUtils/baselibrarykt

.gitlab-ci.yml

@@ -3,13 +3,8 @@ image: thyrlian/android-sdk
 before_script:
   - chmod +x gradlew
 
-test:
-  stage: test
-  script:
-    - ./gradlew clean assembleRelease test --stacktrace
-
 test-build-deploy:
   stage: test
   script:
-    - ./gradlew clean assembleRelease sourcesJar javadocJar test --stacktrace
+    - ./gradlew clean assembleRelease sourcesJar test --stacktrace
     - ./gradlew publish --stacktrace
\ No newline at end of file

build.gradle

@@ -46,7 +46,6 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:$ANDROID_GRADLE_PLUGIN_VERSION"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
-        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.18"
     }
 }
 

library/build.gradle

 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'org.jetbrains.dokka-android'
 
 group = 'com.frostnerd.utilskt'
 ext {
@@ -77,16 +76,6 @@ task sourcesJar(type: Jar) {
     classifier = 'sources'
 }
 
-task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
-    outputFormat = 'javadoc'
-    outputDirectory = "$buildDir/javadoc"
-}
-
-task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
-    classifier = 'javadoc'
-    from "$buildDir/javadoc"
-}
-
 afterEvaluate {
     publishing {
         publications {
@@ -99,9 +88,6 @@ afterEvaluate {
                 artifact (sourcesJar) {
                     classifier = 'sources'
                 }
-                artifact (javadocJar) {
-                    classifier = 'javadoc'
-                }
 
                 pom.withXml {
                     def dependenciesNode = asNode().appendNode('dependencies')
@@ -128,4 +114,4 @@ afterEvaluate {
         }
     }
 }
-publish.dependsOn("assembleRelease", "sourcesJar", "javadocJar")
\ No newline at end of file
+publish.dependsOn("assembleRelease", "sourcesJar")
\ No newline at end of file