Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Javadoc generation #123

Merged
merged 4 commits into from
Dec 13, 2023
Merged

Fix Javadoc generation #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01fb7f8
Raise version to 1.8.2-SNAPSHOT
TomasKypta Dec 12, 2023
9943598
Fix Javadoc generation by including Dokka output
TomasKypta Dec 12, 2023
d13b2ca
Update version of publish-plugin
TomasKypta Dec 12, 2023
d214de3
Fix lint issue
TomasKypta Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
3 changes: 2 additions & 1 deletion buildSrc/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/Constants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion library/android-release-aar.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ plugins {
id("com.android.library")
kotlin("android")
id("de.mobilej.unmock")
id("org.jetbrains.dokka")
}

android {
Expand Down
2 changes: 1 addition & 1 deletion library/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading