Merge branch 'develop' into issues/rename-proximity-timestamps

wultra · Dec 13, 2023 · 8e0b763 · 8e0b763
2 parents 5a9231d + 4ac070a
commit 8e0b763
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,15 +19,14 @@ buildscript {
         mavenLocal()
         mavenCentral()
         google()
-        maven {
-            url = java.net.URI("https://plugins.gradle.org/m2/")
-        }
+        maven(url = "https://plugins.gradle.org/m2/")
     }
     dependencies {
         classpath("com.android.tools.build:gradle:${Constants.BuildScript.androidPluginVersion}")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Constants.BuildScript.kotlinVersion}")
+        classpath("org.jetbrains.dokka:dokka-gradle-plugin:${Constants.BuildScript.dokkaVersion}")
         // releasing
-        classpath("io.github.gradle-nexus:publish-plugin:1.1.0")
+        classpath("io.github.gradle-nexus:publish-plugin:${Constants.BuildScript.publishVersion}")
         // tests
         classpath("com.github.bjoernq:unmockplugin:0.7.9")
     }

diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
@@ -3,4 +3,5 @@
 
 systemProp.kotlinVersion=1.8.22
 systemProp.androidPluginVersion=8.1.4
-systemProp.dokkaVersion=1.8.20
+systemProp.dokkaVersion=1.8.20
+systemProp.publishVersion=1.3.0
diff --git a/buildSrc/src/main/kotlin/Constants.kt b/buildSrc/src/main/kotlin/Constants.kt
@@ -23,6 +23,7 @@ object Constants {
         val androidPluginVersion: String by System.getProperties()
         val kotlinVersion: String by System.getProperties()
         val dokkaVersion: String by System.getProperties()
+        val publishVersion: String by System.getProperties()
     }
 
     object Java {

diff --git a/library/android-release-aar.gradle b/library/android-release-aar.gradle
@@ -64,9 +64,10 @@ task androidSourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
 }
 
-task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+task androidJavadocsJar(type: Jar, dependsOn: [androidJavadocs, dokkaJavadoc]) {
     archiveClassifier.set('javadoc')
     from androidJavadocs.destinationDir
+    from(dokkaJavadoc.outputDirectory)
 }
 
 artifacts {

diff --git a/library/build.gradle.kts b/library/build.gradle.kts
@@ -20,6 +20,7 @@ plugins {
     id("com.android.library")
     kotlin("android")
     id("de.mobilej.unmock")
+    id("org.jetbrains.dokka")
 }
 
 android {

diff --git a/library/gradle.properties b/library/gradle.properties
@@ -14,6 +14,6 @@
 # and limitations under the License.
 #
 
-VERSION_NAME=1.8.1-SNAPSHOT
+VERSION_NAME=1.8.2-SNAPSHOT
 GROUP_ID=com.wultra.android.mtokensdk
 ARTIFACT_ID=wultra-mtoken-sdk