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.

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

Sync dev #31

Merged
merged 10 commits into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ jobs:
java-version: '17'
distribution: 'temurin'
- name: Setup Gradle
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
uses: gradle/actions/setup-gradle@v4
with:
gradle-version: 8.7
- name: Build package
run: ./gradlew build
run: gradle build
env:
GITHUB_TOKEN: ${{ secrets.JAVA_TOKEN }}
- name: Upload artifact
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up JDK 17
uses: actions/[email protected]
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'
cache: 'gradle'
- name: Bump Version
Expand Down Expand Up @@ -44,11 +44,12 @@ jobs:
with:
fetch-tags: true
fetch-depth: 0
- uses: gradle/actions/setup-gradle@v3
- uses: gradle/actions/setup-gradle@v4
with:
gradle-version: 8.7
gradle-home-cache-cleanup: true
- name: Retrieve Version
run: echo "gradle_version=$(./gradlew printVersion -q --console=plain)" >> "$GITHUB_OUTPUT"
run: echo "gradle_version=$(gradle printVersion -q --console=plain)" >> "$GITHUB_OUTPUT"
id: gradle_version
- name: Trigger publication workflow
env:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/publish-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ jobs:
with:
distribution: 'zulu'
java-version: 17
- uses: gradle/actions/setup-gradle@v3
- uses: gradle/actions/setup-gradle@v4
with:
gradle-version: 8.7
gradle-home-cache-cleanup: true
- name: Build html
run: ./gradlew dokkaHtml --no-daemon --stacktrace
run: gradle dokkaHtml --no-daemon --stacktrace
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/publish-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ jobs:
java-version: '17'
distribution: 'temurin'
- name: Setup Gradle
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
uses: gradle/actions/setup-gradle@v4
with:
gradle-version: 8.7
- name: Publish package
run: ./gradlew publish
run: gradle publish
env:
GITHUB_TOKEN: ${{ secrets.JAVA_TOKEN }}
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
Expand Down
153 changes: 0 additions & 153 deletions build.gradle

This file was deleted.

150 changes: 150 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
import java.util.Properties

plugins {
java
id("org.jetbrains.kotlin.jvm") version "1.9.22"
id("com.gradleup.shadow") version "8.3.0"
id("maven-publish")
id("org.jetbrains.dokka") version "1.9.20"
id("net.minecrell.plugin-yml.paper") version "0.6.0"
}

group = "io.github.staticfx"
version = "1.1.0"

repositories {
mavenCentral()
maven("https://repo.papermc.io/repository/maven-public/") {
name = "papermc-repo"
}
maven("https://repo.codemc.io/repository/maven-public/") {
name = "CodeMC"
}
}

paper {
name = "KIA-Kotlin-Inventory-API"
main = "de.staticred.kia.KIA"
apiVersion = "1.20"
version = rootProject.version.toString()
author = "StaticRed / StaticFX"
website = "https://github.com/StaticFX/KIA"
}

subprojects {
apply(plugin = "org.jetbrains.dokka")
}

dependencies {
compileOnly("io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT")
shadow("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
}

java {
withSourcesJar()
withJavadocJar()
}

val generatedVersionDir = "$buildDir/generated-version"

sourceSets {
named("main") {
output.dir(mapOf("builtBy" to "generateVersionProperties"), generatedVersionDir)
}
}

tasks.register("generateVersionProperties") {
doLast {
val propertiesFile = file("$generatedVersionDir/version.properties")
propertiesFile.parentFile.mkdirs()
val properties = Properties()
properties.setProperty("version", rootProject.version.toString())
propertiesFile.writer().use { properties.store(it, null) }
}
}
tasks.named("processResources") {
dependsOn("generateVersionProperties")
}

publishing {
repositories {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/StaticFX/KIA")
credentials {
username = System.getenv("GITHUB_ACTOR")
password = System.getenv("GITHUB_TOKEN")
}
}
maven {
name = "OSSRH"
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
credentials {
username = System.getenv("MAVEN_USERNAME")
password = System.getenv("MAVEN_PASSWORD")
}
}
}

publications {
create<MavenPublication>("maven") {
from(components["java"])
groupId = "io.github.staticfx"
artifactId = "kia"
version = rootProject.version.toString()

pom {
name.set("KIA")
description.set("Kotlin inventory API for MC")
url.set("https://github.com/StaticFX/KIA")

licenses {
license {
name.set("GNU GENERAL PUBLIC LICENSE")
url.set("https://www.gnu.org/licenses/gpl-3.0.de.html")
}
}
developers {
developer {
id.set("staticfx")
name.set("StaticFX")
email.set("[email protected]")
}
}
}
}
}
}

tasks.register("printVersion") {
doLast {
println(rootProject.version.toString())
}
}

tasks {
shadowJar {
minimize()
relocate("de.tr7zw.changeme.nbtapi", "de.staticred.kia.nbtapi")
}

build {
dependsOn(shadowJar)
}
}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
}
}

sourceSets {
named("main") {
kotlin.srcDir("src/main/kotlin")
}
}

kotlin {
jvmToolchain(21)
}
6 changes: 3 additions & 3 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>de.staticred.kia</groupId>
<artifactId>kia</artifactId>
<version>1.0.4</version>
<version>1.1.0</version>
<scope>provided</scope>
</dependency>
```
Expand All @@ -41,7 +41,7 @@
}
}

compileOnly "de.staticred.kia:kia:1.0.4"
compileOnly "de.staticred.kia:kia:1.1.0"
```

</details>
Expand All @@ -54,7 +54,7 @@
maven { setUrl("https://jitpack.io") }
}

api("de.staticred.kia:kia:1.0.4")
api("de.staticred.kia:kia:1.1.0")
```
</details>

Expand Down
Loading