Skip to content
This repository has been archived by the owner on Sep 9, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1 from TurnipTales/feature/1083-ttf-1206
Browse files Browse the repository at this point in the history
feature/1083-ttf-1206
  • Loading branch information
rettichlp authored Jun 7, 2024
2 parents d58fff1 + b3deeda commit 0f1b589
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 20 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'
cache: gradle

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3

- name: Build with Gradle
run: ./gradlew build --full-stacktrace
run: ./gradlew shadowJar --full-stacktrace

- name: Upload artifact
uses: actions/upload-artifact@v2
Expand Down
28 changes: 11 additions & 17 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import io.papermc.paperweight.tasks.RemapJar

group = "net.turniptales"
version = "1.0.0"
description = "TurnipTales Libraries"

java.sourceCompatibility = JavaVersion.VERSION_17
java.sourceCompatibility = JavaVersion.VERSION_21

plugins {
id("java-library")
id("io.papermc.paperweight.userdev") version "1.5.11"
id("io.papermc.paperweight.userdev") version "1.7.1"
id("com.github.johnrengelman.shadow") version "8.1.1"
}

Expand All @@ -18,18 +16,18 @@ repositories {
maven("https://maven.citizensnpcs.co/repo")
maven("https://jitpack.io")
maven("https://repo.maven.apache.org/maven2/")
maven("https://maven.rettichlp.de/releases")
}

dependencies {
api("org.springframework", "spring-web", "6.1.2")
api("org.springframework", "spring-webflux", "6.1.2")
api("com.google.code.gson", "gson", "2.10.1")
api("com.google.inject", "guice", "5.1.0")
api("org.springframework", "spring-web", "6.1.8")
api("org.springframework", "spring-webflux", "6.1.8")
api("com.google.code.gson", "gson", "2.11.0")
api("com.google.inject", "guice", "7.0.0")
api("com.jeff-media", "json-configuration-serialization", "1.1.4")
// https://mvnrepository.com/artifact/net.dv8tion/JDA
api("net.dv8tion", "JDA", "5.0.0-beta.20")
api("de.rettichlp", "dclogging", "1.1.4")

paperweight.paperDevBundle("1.20.4-R0.1-SNAPSHOT")
paperweight.paperDevBundle("1.20.6-R0.1-SNAPSHOT")
}

tasks {
Expand All @@ -41,12 +39,8 @@ tasks {
options.encoding = "UTF-8"
}

withType<RemapJar> {
outputJar.set(layout.buildDirectory.file("libs/turniptales-libraries.jar"))
}

assemble {
dependsOn(reobfJar)
shadowJar {
archiveFileName.set("turniptales-libraries.jar")
}

}

0 comments on commit 0f1b589

Please sign in to comment.