chore(build): Update versions to match upstream and commit build publishing changes

This commit is contained in:
2024-08-09 09:48:25 -06:00
2 changed files with 27 additions and 24 deletions

View File

@@ -1,23 +1,22 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
val githubRepo = "jakobkmar/KSpigot"
group = "net.axay" group = "net.axay"
version = "1.20.1" version = "1.20.1.2-VAL"
description = "A Kotlin API for Minecraft plugins using the Spigot or Paper toolchain" description = "A Kotlin API for Minecraft plugins using the Spigot or Paper toolchain"
plugins { plugins {
kotlin("jvm") version "1.8.22" kotlin("jvm") version "1.9.24"
kotlin("plugin.serialization") version "1.8.22" kotlin("plugin.serialization") version "1.9.24"
`java-library` `java-library`
`maven-publish` `maven-publish`
signing signing
id("org.jetbrains.dokka") version "1.8.20" id("org.jetbrains.dokka") version "1.9.20"
id("io.papermc.paperweight.userdev") version "1.5.5" id("io.papermc.paperweight.userdev") version "1.7.1"
} }
repositories { repositories {
@@ -27,9 +26,9 @@ repositories {
dependencies { dependencies {
paperweight.paperDevBundle("1.20.1-R0.1-SNAPSHOT") paperweight.paperDevBundle("1.20.1-R0.1-SNAPSHOT")
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1") api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1") api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.7.1") api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.8.1")
} }
tasks { tasks {
@@ -39,11 +38,11 @@ tasks {
withType<JavaCompile> { withType<JavaCompile> {
options.encoding = "UTF-8" options.encoding = "UTF-8"
options.release.set(17) options.release.set(21)
} }
withType<KotlinCompile> { withType<KotlinCompile> {
kotlinOptions.jvmTarget = "17" compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
} }
dokkaHtml.configure { dokkaHtml.configure {
@@ -56,15 +55,21 @@ java {
withJavadocJar() withJavadocJar()
} }
//signing { val giteaToken: String by project
// sign(publishing.publications)
//}
publishing { publishing {
repositories { repositories {
maven("https://oss.sonatype.org/service/local/staging/deploy/maven2") { maven("https://git.valence-smp.net/api/packages/star/maven") {
name = "ossrh" name = "gitea"
credentials(PasswordCredentials::class)
credentials(HttpHeaderCredentials::class) {
name = "Authorization"
value = "token $giteaToken"
}
authentication {
create<HttpHeaderAuthentication>("header")
}
} }
} }
@@ -94,11 +99,11 @@ publishing {
} }
} }
url.set("https://github.com/${githubRepo}") url.set("https://git.valence-smp.net/api/packages/star/maven")
scm { scm {
connection.set("scm:git:git://github.com/${githubRepo}.git") connection.set("scm:git:git://git.valence-smp.net/api/packages/star/maven.git")
url.set("https://github.com/${githubRepo}/tree/main") url.set("https://git.valence-smp.net/star/KSpigot")
} }
} }
} }

View File

@@ -1,7 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists