Skip to content

Commit 3e97f61

Browse files
rainbowdashlabsrenovate[bot]
rainbowdashlabs
and
renovate[bot]
authored
Release 2.0.0 (#32)
* Update slf4j monorepo to v2.0.17 (#9) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lilly Tempest <46890129+rainbowdashlabs@users.noreply.github.com> * Update plugin com.diffplug.spotless to v7.0.3 (#14) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update plugin org.gradle.toolchains.foojay-resolver-convention to v0.10.0 (#15) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency gradle to v8.14 (#16) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update plugin org.gradle.toolchains.foojay-resolver-convention to v1 (#18) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency gradle to v8.14.1 (#19) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update plugin com.diffplug.spotless to v7.0.4 (#20) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency gradle to v8.14.2 (#21) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency gradle to v8.14.3 (#22) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update plugin com.diffplug.spotless to v7.1.0 (#23) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update plugin com.diffplug.spotless to v7.2.0 (#24) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update plugin com.diffplug.spotless to v7.2.1 (#25) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update indra to v3.2.0 (#26) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update Gradle to v8.14.4 (#27) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Migration to jackson 3 * Cleanup repo * Update gradle * Update dependency org.jetbrains:annotations to v26.1.0 (#30) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update junit-framework monorepo to v6.0.3 (#31) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Reformat code --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 parent 0a149ab commit 3e97f61

18 files changed

Lines changed: 164 additions & 209 deletions

‎build.gradle.kts‎

Lines changed: 26 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
import com.vanniktech.maven.publish.JavaLibrary
22
import com.vanniktech.maven.publish.JavadocJar
3-
import com.vanniktech.maven.publish.SonatypeHost
43

54
plugins {
65
java
76
`java-library`
87
id("de.chojo.publishdata") version "1.4.0"
98
alias(libs.plugins.spotless)
10-
id("com.vanniktech.maven.publish") version "0.31.0"
9+
id("com.vanniktech.maven.publish") version "0.36.0"
1110
}
1211

12+
// OpenRewrite configuration will be passed via command line properties
13+
1314
publishData {
1415
useEldoNexusRepos(false)
15-
publishingVersion = "1.0.2"
16+
publishingVersion = "2.0.0"
1617
}
1718

1819
group = "dev.chojo"
@@ -25,25 +26,27 @@ repositories {
2526
}
2627

2728
dependencies {
28-
compileOnly("org.slf4j", "slf4j-api", "2.0.16")
29-
compileOnlyApi("org.jetbrains", "annotations", "26.0.2")
30-
api("com.fasterxml.jackson.core", "jackson-databind") {
29+
compileOnly("org.slf4j", "slf4j-api", "2.0.17")
30+
compileOnlyApi("org.jetbrains", "annotations", "26.1.0")
31+
api("tools.jackson.core", "jackson-databind") {
3132
version {
32-
require("2.13.0")
33-
prefer("2.17.1")
33+
require("3.0.0")
34+
prefer("3.1.1")
3435
}
3536
}
36-
compileOnly("com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml")
37-
compileOnly("com.fasterxml.jackson.dataformat", "jackson-dataformat-toml")
38-
39-
testImplementation(platform("org.junit:junit-bom:5.11.4"))
40-
testImplementation("org.junit.jupiter:junit-jupiter")
41-
testImplementation("org.jetbrains", "annotations", "26.0.2")
42-
testImplementation("org.slf4j", "slf4j-api", "2.0.16")
43-
testImplementation("org.slf4j", "slf4j-simple", "2.0.16")
44-
testImplementation("com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml")
45-
testImplementation("com.fasterxml.jackson.dataformat", "jackson-dataformat-toml")
46-
testImplementation("de.eldoria.jacksonbukkit", "paper", "1.2.0")
37+
compileOnly("tools.jackson.dataformat", "jackson-dataformat-yaml")
38+
compileOnly("tools.jackson.dataformat", "jackson-dataformat-toml")
39+
40+
testImplementation("org.junit.jupiter:junit-jupiter-api:6.0.1")
41+
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:6.0.1")
42+
testRuntimeOnly("org.junit.jupiter:junit-jupiter-params:6.0.3")
43+
testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.3")
44+
testImplementation("org.jetbrains", "annotations", "26.1.0")
45+
testImplementation("org.slf4j", "slf4j-api", "2.0.17")
46+
testImplementation("org.slf4j", "slf4j-simple", "2.0.17")
47+
testImplementation("tools.jackson.dataformat", "jackson-dataformat-yaml")
48+
testImplementation("tools.jackson.dataformat", "jackson-dataformat-toml")
49+
testImplementation("de.eldoria.jacksonbukkit", "paper", "2.0.0")
4750
}
4851

4952
spotless {
@@ -55,12 +58,11 @@ spotless {
5558

5659
java {
5760
toolchain {
58-
languageVersion.set(JavaLanguageVersion.of(17))
61+
languageVersion.set(JavaLanguageVersion.of(21))
5962
}
6063
}
6164

6265
mavenPublishing{
63-
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
6466
signAllPublications()
6567

6668
coordinates(groupId = "dev.chojo", artifactId = "ocular", version = publishData.getVersion())
@@ -80,7 +82,7 @@ mavenPublishing{
8082
developers{
8183
developer{
8284
id.set("rainbowdashlabs")
83-
name.set("Lilly Fülling")
85+
name.set("Nora Fülling")
8486
email.set("mail@chojo.dev")
8587
url.set("https://github.com/rainbowdashlabs")
8688
}
@@ -93,44 +95,14 @@ mavenPublishing{
9395
}
9496
}
9597

98+
99+
96100
configure(JavaLibrary(
97101
javadocJar = JavadocJar.Javadoc(),
98102
sourcesJar = true
99103
))
100104
}
101105

102-
//
103-
//indra {
104-
//
105-
// publishReleasesTo("central", "https://central.sonatype.com")
106-
//
107-
// javaVersions {
108-
// target(17)
109-
// testWith(17)
110-
// }
111-
//
112-
// github("rainbowdashlabs", "ocular") {
113-
// ci(true)
114-
// }
115-
//
116-
// lgpl3OrLaterLicense()
117-
//
118-
// signWithKeyFromPrefixedProperties("rainbowdashlabs")
119-
//
120-
// configurePublications {
121-
// pom {
122-
// developers {
123-
// developer {
124-
// id.set("rainbowdashlabs")
125-
// name.set("Lilly Fülling")
126-
// email.set("mail@chojo.dev")
127-
// url.set("https://github.com/rainbowdashlabs")
128-
// }
129-
// }
130-
// }
131-
// }
132-
//}
133-
134106
tasks {
135107
test {
136108
dependsOn(spotlessCheck)

‎gradle/wrapper/gradle-wrapper.jar‎

5.14 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew‎

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎settings.gradle.kts‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,23 @@ pluginManagement {
1313
}
1414

1515
plugins {
16-
id("org.gradle.toolchains.foojay-resolver-convention") version ("0.9.0")
16+
id("org.gradle.toolchains.foojay-resolver-convention") version ("1.0.0")
1717
}
1818

1919
dependencyResolutionManagement {
2020
versionCatalogs {
2121
create("libs") {
2222

2323
// plugins
24-
plugin("spotless", "com.diffplug.spotless").version("7.0.2")
24+
plugin("spotless", "com.diffplug.spotless").version("7.2.1")
2525
plugin("shadow", "com.github.johnrengelman.shadow").version("8.1.1")
2626

27-
version("indra", "3.1.3")
28-
plugin("indra-core", "net.kyori.indra").versionRef("indra")
29-
plugin("indra-publishing", "net.kyori.indra.publishing").versionRef("indra")
30-
plugin("indra-sonatype", "net.kyori.indra.publishing.sonatype").versionRef("indra")
31-
32-
version("slf4j", "2.0.16")
27+
version("slf4j", "2.0.17")
3328
library("slf4j-api", "org.slf4j", "slf4j-api").versionRef("slf4j")
3429
}
3530

3631
create("testlibs") {
37-
version("slf4j", "2.0.16")
32+
version("slf4j", "2.0.17")
3833
library("slf4j-noop", "org.slf4j", "slf4j-nop").versionRef("slf4j")
3934
library("slf4j-simple", "org.slf4j", "slf4j-simple").versionRef("slf4j")
4035
}

0 commit comments

Comments
 (0)