Merge pull request #8 from z3ntu/new-version

Update dokka and publishing settings
allaboutapps · May 7, 2021 · 5a8f55b · 5a8f55b
2 parents 05c573b + 24564b3
commit 5a8f55b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # A3InAppUpdater
 
-[![Build Status](https://travis-ci.org/allaboutapps/InAppUpdater.svg?branch=master)](https://travis-ci.org/allaboutapps/InAppUpdater)
+[![Build Status](https://travis-ci.org/allaboutapps/A3InAppUpdater.svg?branch=master)](https://travis-ci.org/allaboutapps/A3InAppUpdater)
 [ ![Download](https://api.bintray.com/packages/allaboutapps/A3-Android/at.allaboutapps.inappupdater.a3inappupdater/images/download.svg) ](https://bintray.com/allaboutapps/A3-Android/at.allaboutapps.inappupdater.a3inappupdater/_latestVersion)
 
 

diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.18"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.4.30"
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/inappupdater/build.gradle b/inappupdater/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id "com.jfrog.bintray" version "1.8.1"
-    id 'digital.wup.android-maven-publish' version '3.6.2'
+    id "com.jfrog.bintray" version "1.8.5"
+    id 'maven-publish'
 }
 
 
@@ -10,7 +10,7 @@ version = '1.2.1'
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'org.jetbrains.dokka-android'
+apply plugin: 'org.jetbrains.dokka'
 
 android {
     compileSdkVersion 30
@@ -22,7 +22,7 @@ android {
         versionName "1.0"
 
         // the name of the artifact
-        archivesBaseName = 'a3inappupdater' // e.g. a3webview
+        archivesBaseName = 'a3inappupdater'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -70,25 +70,29 @@ bintray {
     publications = ['mavenAar']
 }
 
-publishing {
-    publications {
-        mavenAar(MavenPublication) {
-            from components.android
-            pom {
-                name = 'InAppUpdater'
-                description = 'Android library to simplify In App Update process'
-                url = 'https://github.com/allaboutapps/InAppUpdater'
-                licenses {
-                    license {
-                        name = 'MIT License'
-                        url = 'http://www.opensource.org/licenses/mit-license.php'
+afterEvaluate {
+    publishing {
+        publications {
+            mavenAar(MavenPublication) {
+                from components.release
+                artifact generateJavadocsJar
+                artifact generateSourcesJar
+                pom {
+                    name = 'InAppUpdater'
+                    description = 'Android library to simplify In App Update process'
+                    url = 'https://github.com/allaboutapps/InAppUpdater'
+                    licenses {
+                        license {
+                            name = 'MIT License'
+                            url = 'http://www.opensource.org/licenses/mit-license.php'
+                        }
                     }
-                }
-                developers {
-                    developer {
-                        id = 'MAG'
-                        name = 'Markus Gursch'
-                        email = 'markus.gursch@allaboutapps.at'
+                    developers {
+                        developer {
+                            id = 'MAG'
+                            name = 'Markus Gursch'
+                            email = 'markus.gursch@allaboutapps.at'
+                        }
                     }
                 }
             }
@@ -100,14 +104,9 @@ task javadoc(type: Javadoc) {
     excludes = ['**/*.kt'] // Exclude all kotlin files from javadoc file.
 }
 
-dokka {
-    outputFormat = 'html'
-    outputDirectory = javadoc.destinationDir
-}
-
-task generateJavadocsJar(type: Jar, dependsOn: dokka) {
+task generateJavadocsJar(type: Jar, dependsOn: dokkaJavadoc) {
     classifier = 'javadoc'
-    from dokka.outputDirectory
+    from dokkaJavadoc.outputDirectory
 }
 
 task generateSourcesJar(type: Jar) {
@@ -121,10 +120,6 @@ task generateJavadocs(type: Javadoc) {
             .join(File.pathSeparator))
 }
 
-artifacts {
-    archives generateSourcesJar, generateJavadocsJar
-}
-
 android {
     lintOptions {
         abortOnError false
@@ -144,5 +139,3 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
-
-apply plugin: 'digital.wup.android-maven-publish'