Skip to content

Upgrade Gradle, AGP and Dokka for JDK 25 #53

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

Open
magisk317 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade Gradle, AGP and Dokka for JDK 25 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
plugins {
alias(libs.plugins.agp.lib)
alias(libs.plugins.dokka)
alias(libs.plugins.dokka.javadoc)
`maven-publish`
signing
}
Expand All @@ -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<MavenPublication>("api") {
artifactId = "api"
group = "io.github.libxposed"
version = "100"
artifact(dokkaJavadocJar)
pom {
name.set("api")
description.set("Modern Xposed API")
Expand Down
14 changes: 11 additions & 3 deletions checks/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,21 @@ 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 {
compileOnly(libs.lint.api)
compileOnly(libs.lint.checks)
compileOnly(libs.kotlin.stdlib)
}

5 changes: 4 additions & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down