Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot[bot] 0e23c3d674
Bump org.json:json from 20230227 to 20230618
Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230227 to 20230618.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
1 year ago

@ -86,14 +86,14 @@ DesertWell is available on JitPack and requires Adventure. You can browse the Ja
First, add the JitPack repository to your `build.gradle`: First, add the JitPack repository to your `build.gradle`:
```groovy ```groovy
repositories { repositories {
maven { url 'https://repo.william278.net/snapshots/' } maven { url 'https://jitpack.io' }
} }
``` ```
Then add the dependency: Then add the dependency:
```groovy ```groovy
dependencies { dependencies {
implementation 'net.william278:desertwell:2.0.4-SNAPSHOT' implementation 'net.william278:PAPIProxyBridge:1.2'
} }
``` ```
</details> </details>
@ -102,4 +102,4 @@ dependencies {
JitPack has a [handy guide](https://jitpack.io/#net.william278/DesertWell/#How_to) for how to use the dependency with other build platforms. JitPack has a [handy guide](https://jitpack.io/#net.william278/DesertWell/#How_to) for how to use the dependency with other build platforms.
## License ## License
DesertWell is licensed under Apache-2.0. DesertWell is licensed under Apache-2.0.

@ -6,8 +6,8 @@ plugins {
id 'java' id 'java'
} }
group 'org.inksnow.husk' group 'net.william278'
version "2.0.5${versionMetadata()}" version "2.0.4${versionMetadata()}"
defaultTasks 'licenseFormat', 'build' defaultTasks 'licenseFormat', 'build'
repositories { repositories {
@ -15,19 +15,19 @@ repositories {
} }
dependencies { dependencies {
implementation 'org.json:json:20230227' implementation 'org.json:json:20230618'
compileOnly 'net.kyori:adventure-api:4.16.0' compileOnly 'net.kyori:adventure-api:4.13.1'
compileOnly 'org.jetbrains:annotations:24.0.1' compileOnly 'org.jetbrains:annotations:24.0.1'
testImplementation 'net.kyori:adventure-platform-bukkit:4.3.2' testImplementation 'net.kyori:adventure-platform-bukkit:4.3.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.3'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.3'
} }
tasks { tasks {
compileJava { compileJava {
options.encoding = 'UTF-8' options.encoding = 'UTF-8'
options.release.set(8) options.release.set(11)
} }
jar { jar {
manifest { manifest {
@ -65,34 +65,48 @@ test {
publishing { publishing {
repositories { repositories {
maven { if (System.getenv("RELEASES_MAVEN_USERNAME") != null) {
name = 'husk-release' maven {
url = findProperty("repository.huskrelease.url") name = "william278-releases"
credentials { url = "https://repo.william278.net/releases"
username = findProperty("repository.huskrelease.username") credentials {
password = findProperty("repository.huskrelease.password") username = System.getenv("RELEASES_MAVEN_USERNAME")
password = System.getenv("RELEASES_MAVEN_PASSWORD")
}
authentication {
basic(BasicAuthentication)
}
}
}
if (System.getenv("SNAPSHOTS_MAVEN_USERNAME") != null) {
maven {
name = "william278-snapshots"
url = "https://repo.william278.net/snapshots"
credentials {
username = System.getenv("SNAPSHOTS_MAVEN_USERNAME")
password = System.getenv("SNAPSHOTS_MAVEN_PASSWORD")
}
authentication {
basic(BasicAuthentication)
}
} }
} }
}
publications { publications {
mavenJava(MavenPublication) { mavenJava(MavenPublication) {
groupId = 'org.inksnow.husk' groupId = 'net.william278'
artifactId = 'desertwell' artifactId = 'desertwell'
version = "$rootProject.version" version = "$rootProject.version"
artifact shadowJar artifact shadowJar
artifact javadocJar artifact javadocJar
artifact sourcesJar artifact sourcesJar
}
} }
} }
} }
@SuppressWarnings('GrMethodMayBeStatic') @SuppressWarnings('GrMethodMayBeStatic')
def versionMetadata() { def versionMetadata() {
if (grgit == null) {
return '-' + System.getenv("GITHUB_RUN_NUMBER") ? 'build.' + System.getenv("GITHUB_RUN_NUMBER") : 'unknown'
}
// Get if there is a tag for this commit // Get if there is a tag for this commit
def tag = grgit.tag.list().find { it.commit.id == grgit.head().id } def tag = grgit.tag.list().find { it.commit.id == grgit.head().id }
if (tag != null) { if (tag != null) {
@ -100,5 +114,8 @@ def versionMetadata() {
} }
// Otherwise, get the last commit hash and if it's a clean head // Otherwise, get the last commit hash and if it's a clean head
if (grgit == null) {
return '-' + System.getenv("GITHUB_RUN_NUMBER") ? 'build.' + System.getenv("GITHUB_RUN_NUMBER") : 'unknown'
}
return '-' + grgit.head().abbreviatedId + (grgit.status().clean ? '' : '-indev') return '-' + grgit.head().abbreviatedId + (grgit.status().clean ? '' : '-indev')
} }
Loading…
Cancel
Save