diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 88cbac9..3bf4d0c 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -1,5 +1,7 @@ plugins { alias(libs.plugins.agp.lib) + alias(libs.plugins.dokka) + alias(libs.plugins.dokka.javadoc) `maven-publish` signing } @@ -20,24 +22,30 @@ android { } compileOptions { - targetCompatibility = JavaVersion.VERSION_1_8 - sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_11 } publishing { singleVariant("release") { withSourcesJar() - withJavadocJar() } } } +val dokkaJavadocJar by tasks.registering(Jar::class) { + archiveClassifier.set("javadoc") + dependsOn("dokkaGeneratePublicationJavadoc") + from(layout.buildDirectory.dir("dokka/javadoc")) +} + publishing { publications { register("api") { artifactId = "api" group = "io.github.libxposed" version = "100" + artifact(dokkaJavadocJar) pom { name.set("api") description.set("Modern Xposed API") diff --git a/checks/build.gradle.kts b/checks/build.gradle.kts index 1ac0040..b1f0b06 100644 --- a/checks/build.gradle.kts +++ b/checks/build.gradle.kts @@ -4,8 +4,17 @@ plugins { } java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 + toolchain { + languageVersion = JavaLanguageVersion.of(25) + } +} + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_25 + } } dependencies { @@ -13,4 +22,3 @@ dependencies { compileOnly(libs.lint.checks) compileOnly(libs.kotlin.stdlib) } - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7afe8af..127a0ba 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,11 +2,14 @@ annotation = "1.9.1" kotlin = "2.3.10" lint = "32.0.1" -agp = "9.0.1" +agp = "9.1.0" +dokka = "2.1.0" [plugins] kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } agp-lib = { id = "com.android.library", version.ref = "agp" } +dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } +dokka-javadoc = { id = "org.jetbrains.dokka-javadoc", version.ref = "dokka" } [libraries] annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f8e1ee3..61285a6 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f78a6..dbc3ce4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME