From 1f7a3dc158fa09a85812a4b9ca27ccdbb97cb865 Mon Sep 17 00:00:00 2001 From: glitch Date: Sat, 1 Jul 2023 17:21:35 -0500 Subject: [PATCH] rename --- README.MD | 8 ++++---- build.gradle.kts | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- gson/build.gradle.kts | 2 +- .../quiltmc/{qup => parsers}/json/gson/GsonReader.java | 10 +++++----- .../quiltmc/{qup => parsers}/json/gson/GsonWriter.java | 10 +++++----- .../json/FormatViolationException.java | 2 +- .../org/quiltmc/{qup => parsers}/json/JsonFormat.java | 2 +- .../org/quiltmc/{qup => parsers}/json/JsonReader.java | 2 +- .../org/quiltmc/{qup => parsers}/json/JsonScope.java | 2 +- .../org/quiltmc/{qup => parsers}/json/JsonToken.java | 2 +- .../org/quiltmc/{qup => parsers}/json/JsonWriter.java | 2 +- .../json/MalformedSyntaxException.java | 2 +- .../quiltmc/{qup => parsers}/json/ParseException.java | 2 +- settings.gradle.kts | 2 +- 15 files changed, 30 insertions(+), 30 deletions(-) rename gson/src/main/java/org/quiltmc/{qup => parsers}/json/gson/GsonReader.java (91%) rename gson/src/main/java/org/quiltmc/{qup => parsers}/json/gson/GsonWriter.java (89%) rename json/src/main/java/org/quiltmc/{qup => parsers}/json/FormatViolationException.java (97%) rename json/src/main/java/org/quiltmc/{qup => parsers}/json/JsonFormat.java (96%) rename json/src/main/java/org/quiltmc/{qup => parsers}/json/JsonReader.java (99%) rename json/src/main/java/org/quiltmc/{qup => parsers}/json/JsonScope.java (98%) rename json/src/main/java/org/quiltmc/{qup => parsers}/json/JsonToken.java (98%) rename json/src/main/java/org/quiltmc/{qup => parsers}/json/JsonWriter.java (99%) rename json/src/main/java/org/quiltmc/{qup => parsers}/json/MalformedSyntaxException.java (97%) rename json/src/main/java/org/quiltmc/{qup => parsers}/json/ParseException.java (97%) diff --git a/README.MD b/README.MD index 5ebc7fa..bb1269e 100644 --- a/README.MD +++ b/README.MD @@ -1,4 +1,4 @@ -# QUP (Quilt Utilities for Parsing) +# Quilt Parsers A collection of utilities involving data files. ## Modules @@ -7,15 +7,15 @@ A simple JSON, JSONC, and JSON5 reader and writer, modeled after GSON's JsonRead Requires Java 8. ```kotlin dependencies { - implementation("org.quiltmc.qup:json:0.1.0") + implementation("org.quiltmc.parsers:json:0.1.0") } ``` ### GSON -An adapter of the JSON module to GSON, allowing QUP JsonReader/Writer objects to be used with methods in the `Gson` class. +An adapter of the JSON module to GSON, allowing parsers JsonReader/Writer objects to be used with methods in the `Gson` class. Requires Java 11. ```kotlin dependencies { - implementation("org.quiltmc.qup:gson:0.1.0") // pulls in correct versions of qup-json and gson + implementation("org.quiltmc.parsers:gson:0.1.0") // pulls in correct versions of parsers-json and gson } ``` diff --git a/build.gradle.kts b/build.gradle.kts index 7431ff7..b56ab29 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -43,15 +43,15 @@ subprojects { publications { create("mavenJava", MavenPublication::class) { pom { - name.set("QUP ${project.displayName.uppercase()}") // TODO: read a property with a real name + name.set("parsers ${project.displayName.uppercase()}") // TODO: read a property with a real name packaging = "jar" description.set(project.description) - url.set("https://github.com/QuiltMC/qup") + url.set("https://github.com/QuiltMC/parsers") scm { - connection.set("scm:git:https://github.com/QuiltMC/qup.git") - developerConnection.set("scm:git:ssh:git@github.com:QuiltMC/qup.git") - url.set("https://github.com/QuiltMC/qup") + connection.set("scm:git:https://github.com/QuiltMC/parsers.git") + developerConnection.set("scm:git:ssh:git@github.com:QuiltMC/parsers.git") + url.set("https://github.com/QuiltMC/parsers") } licenses { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e1bef7e..15de902 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gson/build.gradle.kts b/gson/build.gradle.kts index e78424e..e7004ff 100644 --- a/gson/build.gradle.kts +++ b/gson/build.gradle.kts @@ -5,7 +5,7 @@ plugins { group = rootProject.group.toString() + "." + rootProject.name version = rootProject.version -description = "An adapter of QUP's JSON readers and writers to GSON" +description = "An adapter of quilt-parsers' JSON readers and writers to GSON" repositories { mavenCentral() } diff --git a/gson/src/main/java/org/quiltmc/qup/json/gson/GsonReader.java b/gson/src/main/java/org/quiltmc/parsers/json/gson/GsonReader.java similarity index 91% rename from gson/src/main/java/org/quiltmc/qup/json/gson/GsonReader.java rename to gson/src/main/java/org/quiltmc/parsers/json/gson/GsonReader.java index 2676c0b..95f6c74 100644 --- a/gson/src/main/java/org/quiltmc/qup/json/gson/GsonReader.java +++ b/gson/src/main/java/org/quiltmc/parsers/json/gson/GsonReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.quiltmc.qup.json.gson; +package org.quiltmc.parsers.json.gson; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; @@ -23,20 +23,20 @@ import java.io.Reader; /** - * Adapts a QUP {@link org.quiltmc.qup.json.JsonReader} to be used with {@link com.google.gson.Gson} + * Adapts a quilt-parsers' {@link org.quiltmc.parsers.json.JsonReader} to be used with {@link com.google.gson.Gson} */ public class GsonReader extends JsonReader { - private final org.quiltmc.qup.json.JsonReader delegate; + private final org.quiltmc.parsers.json.JsonReader delegate; /** * Creates a new instance that reads a JSON-encoded stream from {@code in}. * */ - public GsonReader(org.quiltmc.qup.json.JsonReader reader) { + public GsonReader(org.quiltmc.parsers.json.JsonReader reader) { super(Reader.nullReader()); this.delegate = reader; } - public org.quiltmc.qup.json.JsonReader getDelegate() { + public org.quiltmc.parsers.json.JsonReader getDelegate() { return delegate; } diff --git a/gson/src/main/java/org/quiltmc/qup/json/gson/GsonWriter.java b/gson/src/main/java/org/quiltmc/parsers/json/gson/GsonWriter.java similarity index 89% rename from gson/src/main/java/org/quiltmc/qup/json/gson/GsonWriter.java rename to gson/src/main/java/org/quiltmc/parsers/json/gson/GsonWriter.java index be21397..28ab3ea 100644 --- a/gson/src/main/java/org/quiltmc/qup/json/gson/GsonWriter.java +++ b/gson/src/main/java/org/quiltmc/parsers/json/gson/GsonWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.quiltmc.qup.json.gson; +package org.quiltmc.parsers.json.gson; import com.google.gson.stream.JsonWriter; @@ -22,17 +22,17 @@ import java.io.Writer; /** - * Adapts a QUP {@link org.quiltmc.qup.json.JsonWriter} to be used with {@link com.google.gson.Gson} + * Adapts a quilt-parsers' {@link org.quiltmc.parsers.json.JsonWriter} to be used with {@link com.google.gson.Gson} */ public class GsonWriter extends JsonWriter { - private final org.quiltmc.qup.json.JsonWriter delegate; + private final org.quiltmc.parsers.json.JsonWriter delegate; - public GsonWriter(org.quiltmc.qup.json.JsonWriter writer) { + public GsonWriter(org.quiltmc.parsers.json.JsonWriter writer) { super(Writer.nullWriter()); this.delegate = writer; } - public org.quiltmc.qup.json.JsonWriter getDelegate() { + public org.quiltmc.parsers.json.JsonWriter getDelegate() { return delegate; } diff --git a/json/src/main/java/org/quiltmc/qup/json/FormatViolationException.java b/json/src/main/java/org/quiltmc/parsers/json/FormatViolationException.java similarity index 97% rename from json/src/main/java/org/quiltmc/qup/json/FormatViolationException.java rename to json/src/main/java/org/quiltmc/parsers/json/FormatViolationException.java index d96599d..0af6a7f 100644 --- a/json/src/main/java/org/quiltmc/qup/json/FormatViolationException.java +++ b/json/src/main/java/org/quiltmc/parsers/json/FormatViolationException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.quiltmc.qup.json; +package org.quiltmc.parsers.json; public class FormatViolationException extends ParseException { public FormatViolationException() { diff --git a/json/src/main/java/org/quiltmc/qup/json/JsonFormat.java b/json/src/main/java/org/quiltmc/parsers/json/JsonFormat.java similarity index 96% rename from json/src/main/java/org/quiltmc/qup/json/JsonFormat.java rename to json/src/main/java/org/quiltmc/parsers/json/JsonFormat.java index 85f31f3..aee06dc 100644 --- a/json/src/main/java/org/quiltmc/qup/json/JsonFormat.java +++ b/json/src/main/java/org/quiltmc/parsers/json/JsonFormat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.quiltmc.qup.json; +package org.quiltmc.parsers.json; /** * The JSON-family format to be used during parsing or writing. diff --git a/json/src/main/java/org/quiltmc/qup/json/JsonReader.java b/json/src/main/java/org/quiltmc/parsers/json/JsonReader.java similarity index 99% rename from json/src/main/java/org/quiltmc/qup/json/JsonReader.java rename to json/src/main/java/org/quiltmc/parsers/json/JsonReader.java index 3d1366c..2b1b358 100644 --- a/json/src/main/java/org/quiltmc/qup/json/JsonReader.java +++ b/json/src/main/java/org/quiltmc/parsers/json/JsonReader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.quiltmc.qup.json; +package org.quiltmc.parsers.json; import java.io.*; import java.math.BigDecimal; diff --git a/json/src/main/java/org/quiltmc/qup/json/JsonScope.java b/json/src/main/java/org/quiltmc/parsers/json/JsonScope.java similarity index 98% rename from json/src/main/java/org/quiltmc/qup/json/JsonScope.java rename to json/src/main/java/org/quiltmc/parsers/json/JsonScope.java index c53d8c0..c0ae99a 100644 --- a/json/src/main/java/org/quiltmc/qup/json/JsonScope.java +++ b/json/src/main/java/org/quiltmc/parsers/json/JsonScope.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.quiltmc.qup.json; +package org.quiltmc.parsers.json; /* * This is a carbon-copy of Gson's JsonScope. diff --git a/json/src/main/java/org/quiltmc/qup/json/JsonToken.java b/json/src/main/java/org/quiltmc/parsers/json/JsonToken.java similarity index 98% rename from json/src/main/java/org/quiltmc/qup/json/JsonToken.java rename to json/src/main/java/org/quiltmc/parsers/json/JsonToken.java index 0a3cc71..7833b14 100644 --- a/json/src/main/java/org/quiltmc/qup/json/JsonToken.java +++ b/json/src/main/java/org/quiltmc/parsers/json/JsonToken.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.quiltmc.qup.json; +package org.quiltmc.parsers.json; /* * This is a carbon-copy of Gson's JsonToken. diff --git a/json/src/main/java/org/quiltmc/qup/json/JsonWriter.java b/json/src/main/java/org/quiltmc/parsers/json/JsonWriter.java similarity index 99% rename from json/src/main/java/org/quiltmc/qup/json/JsonWriter.java rename to json/src/main/java/org/quiltmc/parsers/json/JsonWriter.java index 85e1b59..f203c89 100644 --- a/json/src/main/java/org/quiltmc/qup/json/JsonWriter.java +++ b/json/src/main/java/org/quiltmc/parsers/json/JsonWriter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.quiltmc.qup.json; +package org.quiltmc.parsers.json; import org.jetbrains.annotations.Nullable; diff --git a/json/src/main/java/org/quiltmc/qup/json/MalformedSyntaxException.java b/json/src/main/java/org/quiltmc/parsers/json/MalformedSyntaxException.java similarity index 97% rename from json/src/main/java/org/quiltmc/qup/json/MalformedSyntaxException.java rename to json/src/main/java/org/quiltmc/parsers/json/MalformedSyntaxException.java index 740224a..0e2f314 100644 --- a/json/src/main/java/org/quiltmc/qup/json/MalformedSyntaxException.java +++ b/json/src/main/java/org/quiltmc/parsers/json/MalformedSyntaxException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.quiltmc.qup.json; +package org.quiltmc.parsers.json; /** * An exception to be thrown by a parser when the syntax of a file is invalid. diff --git a/json/src/main/java/org/quiltmc/qup/json/ParseException.java b/json/src/main/java/org/quiltmc/parsers/json/ParseException.java similarity index 97% rename from json/src/main/java/org/quiltmc/qup/json/ParseException.java rename to json/src/main/java/org/quiltmc/parsers/json/ParseException.java index 004a4bb..8fb100f 100644 --- a/json/src/main/java/org/quiltmc/qup/json/ParseException.java +++ b/json/src/main/java/org/quiltmc/parsers/json/ParseException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.quiltmc.qup.json; +package org.quiltmc.parsers.json; /** * A generic exception relating to an error in parsing, from loading the text to be read to emitting it's final representation. diff --git a/settings.gradle.kts b/settings.gradle.kts index 5cae68e..1d3ef75 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,3 @@ -rootProject.name = "qup" +rootProject.name = "parsers" include("json") include("gson") \ No newline at end of file