switch to new group id, io.github.fastily

build.gradle

@@ -7,15 +7,15 @@ plugins {
 }
 
 description="${project.name} build script"
-group="org.fastily"
-version="1.9.0"
+group="io.github.fastily"
+version="1.10.0"
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    api "com.google.code.gson:gson:2.8.9"
+    api "com.google.code.gson:gson:2.9.0"
     api "com.squareup.okhttp3:okhttp:4.9.3"
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
@@ -48,17 +48,17 @@ javadoc {
         setMemberLevel JavadocMemberLevel.PUBLIC
         setAuthor true
 
-        links "https://docs.oracle.com/en/java/javase/11/docs/api/"
+        links "https://docs.oracle.com/en/java/javase/17/docs/api/"
         //links "https://square.github.io/okio/1.x/okio/"
         //links "https://square.github.io/okhttp/3.x/okhttp/"
-        links "https://www.javadoc.io/doc/com.google.code.gson/gson/2.8.9/"
+        links "https://www.javadoc.io/doc/com.google.code.gson/gson/2.9.0/"
 
         // setOutputLevel JavadocOutputLevel.VERBOSE
     }
 }
 
 wrapper {
-    gradleVersion = '7.4'
+    gradleVersion = '7.4.2'
 }
 
 
@@ -96,7 +96,7 @@ publishing {
 
     repositories {
         maven {
-            url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+            url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
 
             credentials {
                 username project.hasProperty("ossrhUsername") ? project.properties["ossrhUsername"] : System.getenv('ossrhUsername')

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/org/fastily/jwiki/core/ApiClient.java → src/main/java/io/github/fastily/jwiki/core/ApiClient.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.core;
+package io.github.fastily.jwiki.core;
 
 import java.io.IOException;
 import java.net.Proxy;
@@ -7,8 +7,7 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.fastily.jwiki.util.FL;
-
+import io.github.fastily.jwiki.util.FL;
 import okhttp3.Cookie;
 import okhttp3.CookieJar;
 import okhttp3.FormBody;

src/main/java/org/fastily/jwiki/core/ColorLog.java → src/main/java/io/github/fastily/jwiki/core/ColorLog.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.core;
+package io.github.fastily.jwiki.core;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;

src/main/java/org/fastily/jwiki/core/Conf.java → src/main/java/io/github/fastily/jwiki/core/Conf.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.core;
+package io.github.fastily.jwiki.core;
 
 import okhttp3.HttpUrl;
 

src/main/java/org/fastily/jwiki/core/MQuery.java → src/main/java/io/github/fastily/jwiki/core/MQuery.java

@@ -1,21 +1,21 @@
-package org.fastily.jwiki.core;
+package io.github.fastily.jwiki.core;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 
-import org.fastily.jwiki.core.WQuery.QTemplate;
-import org.fastily.jwiki.dwrap.ImageInfo;
-import org.fastily.jwiki.util.FL;
-import org.fastily.jwiki.util.GSONP;
-import org.fastily.jwiki.util.GroupQueue;
-import org.fastily.jwiki.util.MultiMap;
-import org.fastily.jwiki.util.Tuple;
-
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
+import io.github.fastily.jwiki.core.WQuery.QTemplate;
+import io.github.fastily.jwiki.dwrap.ImageInfo;
+import io.github.fastily.jwiki.util.FL;
+import io.github.fastily.jwiki.util.GSONP;
+import io.github.fastily.jwiki.util.GroupQueue;
+import io.github.fastily.jwiki.util.MultiMap;
+import io.github.fastily.jwiki.util.Tuple;
+
 /**
  * Perform multi-title queries. Use of these methods is intended for
  * <span style="text-decoration:underline;">advanced</span> users who wish to make queries to the server over a large

src/main/java/org/fastily/jwiki/core/NS.java → src/main/java/io/github/fastily/jwiki/core/NS.java

@@ -1,15 +1,15 @@
-package org.fastily.jwiki.core;
+package io.github.fastily.jwiki.core;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
-import org.fastily.jwiki.util.FL;
-import org.fastily.jwiki.util.GSONP;
-
 import com.google.gson.JsonObject;
 
+import io.github.fastily.jwiki.util.FL;
+import io.github.fastily.jwiki.util.GSONP;
+
 /**
  * Contains default namespaces and methods to get non-standard namespaces.
  * 

src/main/java/org/fastily/jwiki/core/WAction.java → src/main/java/io/github/fastily/jwiki/core/WAction.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.core;
+package io.github.fastily.jwiki.core;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -7,12 +7,11 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.fastily.jwiki.util.FL;
-import org.fastily.jwiki.util.GSONP;
-
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
+import io.github.fastily.jwiki.util.FL;
+import io.github.fastily.jwiki.util.GSONP;
 import okhttp3.HttpUrl;
 import okhttp3.Response;
 import okio.BufferedSource;

src/main/java/org/fastily/jwiki/core/WParser.java → src/main/java/io/github/fastily/jwiki/core/WParser.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.core;
+package io.github.fastily.jwiki.core;
 
 import java.io.StringReader;
 import java.util.ArrayDeque;
@@ -16,11 +16,11 @@
 import javax.xml.stream.events.StartElement;
 import javax.xml.stream.events.XMLEvent;
 
-import org.fastily.jwiki.util.FL;
-import org.fastily.jwiki.util.GSONP;
-
 import com.google.gson.JsonParser;
 
+import io.github.fastily.jwiki.util.FL;
+import io.github.fastily.jwiki.util.GSONP;
+
 /**
  * Parses wikitext into a DOM-style, manipulatable format that is easy to work with.
  * 

src/main/java/org/fastily/jwiki/core/WQuery.java → src/main/java/io/github/fastily/jwiki/core/WQuery.java

@@ -1,18 +1,18 @@
-package org.fastily.jwiki.core;
+package io.github.fastily.jwiki.core;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import org.fastily.jwiki.util.FL;
-import org.fastily.jwiki.util.GSONP;
-
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.reflect.TypeToken;
 
+import io.github.fastily.jwiki.util.FL;
+import io.github.fastily.jwiki.util.GSONP;
+
 /**
  * Wraps the various functions of API functions of {@code action=query}.
  * 

src/main/java/org/fastily/jwiki/core/Wiki.java → src/main/java/io/github/fastily/jwiki/core/Wiki.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.core;
+package io.github.fastily.jwiki.core;
 
 import java.net.Proxy;
 import java.nio.file.Path;
@@ -11,20 +11,19 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 
-import org.fastily.jwiki.dwrap.Contrib;
-import org.fastily.jwiki.dwrap.ImageInfo;
-import org.fastily.jwiki.dwrap.LogEntry;
-import org.fastily.jwiki.dwrap.PageSection;
-import org.fastily.jwiki.dwrap.ProtectedTitleEntry;
-import org.fastily.jwiki.dwrap.RCEntry;
-import org.fastily.jwiki.dwrap.Revision;
-import org.fastily.jwiki.util.FL;
-import org.fastily.jwiki.util.GSONP;
-import org.fastily.jwiki.util.Tuple;
-
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 
+import io.github.fastily.jwiki.dwrap.Contrib;
+import io.github.fastily.jwiki.dwrap.ImageInfo;
+import io.github.fastily.jwiki.dwrap.LogEntry;
+import io.github.fastily.jwiki.dwrap.PageSection;
+import io.github.fastily.jwiki.dwrap.ProtectedTitleEntry;
+import io.github.fastily.jwiki.dwrap.RCEntry;
+import io.github.fastily.jwiki.dwrap.Revision;
+import io.github.fastily.jwiki.util.FL;
+import io.github.fastily.jwiki.util.GSONP;
+import io.github.fastily.jwiki.util.Tuple;
 import okhttp3.HttpUrl;
 import okhttp3.Response;
 

src/main/java/org/fastily/jwiki/core/package-info.java → src/main/java/io/github/fastily/jwiki/core/package-info.java

@@ -5,4 +5,4 @@
  * 
  * @author Fastily
  */
-package org.fastily.jwiki.core;
+package io.github.fastily.jwiki.core;

src/main/java/org/fastily/jwiki/dwrap/Contrib.java → src/main/java/io/github/fastily/jwiki/dwrap/Contrib.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.dwrap;
+package io.github.fastily.jwiki.dwrap;
 
 /**
  * Represents a contribution made by a user.

src/main/java/org/fastily/jwiki/dwrap/DataEntry.java → src/main/java/io/github/fastily/jwiki/dwrap/DataEntry.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.dwrap;
+package io.github.fastily.jwiki.dwrap;
 
 import java.time.Instant;
 

src/main/java/org/fastily/jwiki/dwrap/ImageInfo.java → src/main/java/io/github/fastily/jwiki/dwrap/ImageInfo.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.dwrap;
+package io.github.fastily.jwiki.dwrap;
 
 import okhttp3.HttpUrl;
 

src/main/java/org/fastily/jwiki/dwrap/LogEntry.java → src/main/java/io/github/fastily/jwiki/dwrap/LogEntry.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.dwrap;
+package io.github.fastily.jwiki.dwrap;
 
 /**
  * Represents a MediaWiki Log entry

src/main/java/org/fastily/jwiki/dwrap/PageSection.java → src/main/java/io/github/fastily/jwiki/dwrap/PageSection.java

@@ -1,11 +1,11 @@
-package org.fastily.jwiki.dwrap;
+package io.github.fastily.jwiki.dwrap;
 
 import java.util.ArrayList;
 
-import org.fastily.jwiki.util.GSONP;
-
 import com.google.gson.JsonObject;
 
+import io.github.fastily.jwiki.util.GSONP;
+
 /**
  * Represents a paragraph in a page of wiki text.
  * 

src/main/java/org/fastily/jwiki/dwrap/ProtectedTitleEntry.java → src/main/java/io/github/fastily/jwiki/dwrap/ProtectedTitleEntry.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.dwrap;
+package io.github.fastily.jwiki.dwrap;
 
 /**
  * Represents an entry obtained from the {@code protectedtitles} API module.

src/main/java/org/fastily/jwiki/dwrap/RCEntry.java → src/main/java/io/github/fastily/jwiki/dwrap/RCEntry.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.dwrap;
+package io.github.fastily.jwiki.dwrap;
 
 /**
  * Represents a Recent Changes entry.

src/main/java/org/fastily/jwiki/dwrap/Revision.java → src/main/java/io/github/fastily/jwiki/dwrap/Revision.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.dwrap;
+package io.github.fastily.jwiki.dwrap;
 
 import com.google.gson.annotations.SerializedName;
 

src/main/java/org/fastily/jwiki/dwrap/package-info.java → src/main/java/io/github/fastily/jwiki/dwrap/package-info.java

@@ -3,4 +3,4 @@
  * 
  * @author Fastily
  */
-package org.fastily.jwiki.dwrap;
+package io.github.fastily.jwiki.dwrap;

src/main/java/org/fastily/jwiki/util/FL.java → src/main/java/io/github/fastily/jwiki/util/FL.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.util;
+package io.github.fastily.jwiki.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/java/org/fastily/jwiki/util/GSONP.java → src/main/java/io/github/fastily/jwiki/util/GSONP.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.util;
+package io.github.fastily.jwiki.util;
 
 import java.time.Instant;
 import java.util.ArrayList;

src/main/java/org/fastily/jwiki/util/GroupQueue.java → src/main/java/io/github/fastily/jwiki/util/GroupQueue.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.util;
+package io.github.fastily.jwiki.util;
 
 import java.util.ArrayList;
 import java.util.Collection;

src/main/java/org/fastily/jwiki/util/MultiMap.java → src/main/java/io/github/fastily/jwiki/util/MultiMap.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.util;
+package io.github.fastily.jwiki.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/org/fastily/jwiki/util/Tuple.java → src/main/java/io/github/fastily/jwiki/util/Tuple.java

@@ -1,4 +1,4 @@
-package org.fastily.jwiki.util;
+package io.github.fastily.jwiki.util;
 
 /**
  * Simple implementation of a Tuple. A Tuple is an immutable paired 2-set of values (e.g. (x, y)), and may consist of

src/main/java/org/fastily/jwiki/util/package-info.java → src/main/java/io/github/fastily/jwiki/util/package-info.java

@@ -4,4 +4,4 @@
  * 
  * @author Fastily
  */
-package org.fastily.jwiki.util;
+package io.github.fastily.jwiki.util;

src/test/java/org/fastily/jwiki/test/ActionTests.java → src/test/java/io/github/fastily/jwiki/test/ActionTests.java

@@ -1,13 +1,13 @@
-package org.fastily.jwiki.test;
+package io.github.fastily.jwiki.test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.nio.file.Paths;
 import java.util.concurrent.TimeUnit;
 
-import org.fastily.jwiki.core.NS;
 import org.junit.jupiter.api.Test;
 
+import io.github.fastily.jwiki.core.NS;
 import okhttp3.HttpUrl;
 
 /**

src/test/java/org/fastily/jwiki/test/AuthActionTests.java → src/test/java/io/github/fastily/jwiki/test/AuthActionTests.java

@@ -1,10 +1,11 @@
-package org.fastily.jwiki.test;
+package io.github.fastily.jwiki.test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import org.fastily.jwiki.core.Wiki;
 import org.junit.jupiter.api.Test;
 
+import io.github.fastily.jwiki.core.Wiki;
+
 /**
  * Unit tests for WAction. Tests are performed as if the user is logged in.
  * 

src/test/java/org/fastily/jwiki/test/BaseMockTemplate.java → src/test/java/io/github/fastily/jwiki/test/BaseMockTemplate.java

@@ -1,12 +1,12 @@
-package org.fastily.jwiki.test;
+package io.github.fastily.jwiki.test;
 
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-import org.fastily.jwiki.core.Wiki;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
+import io.github.fastily.jwiki.core.Wiki;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;