Merge remote-tracking branch 'origin/main'

# Conflicts:
#	build.gradle.kts
#	dist/cfr.js
#	docs/index.html

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 val thisVersion = "0.1.0"
 
-group = "dev.cephx"
+group = "run.slicer"
 version = "$thisVersion-${libs.versions.cfr.get()}"
 description = "A JavaScript port of the CFR decompiler."
 
@@ -23,7 +23,7 @@ java.toolchain {
 }
 
 teavm.js {
-    mainClass = "dev.cephx.cfr.Main"
+    mainClass = "run.slicer.cfr.Main"
     moduleType = org.teavm.gradle.api.JSModuleType.ES2015
     // obfuscated = false
     // optimization = org.teavm.gradle.api.OptimizationLevel.NONE

settings.gradle.kts

@@ -1 +1,5 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "cfr"

src/main/java/dev/cephx/cfr/Main.java → src/main/java/run/slicer/cfr/Main.java

@@ -1,7 +1,7 @@
-package dev.cephx.cfr;
+package run.slicer.cfr;
 
-import dev.cephx.cfr.impl.ClassFileSourceImpl;
-import dev.cephx.cfr.impl.OutputSinkFactoryImpl;
+import run.slicer.cfr.impl.ClassFileSourceImpl;
+import run.slicer.cfr.impl.OutputSinkFactoryImpl;
 import org.benf.cfr.reader.api.CfrDriver;
 import org.teavm.interop.Async;
 import org.teavm.interop.AsyncCallback;

src/main/java/dev/cephx/cfr/Options.java → src/main/java/run/slicer/cfr/Options.java

@@ -1,4 +1,4 @@
-package dev.cephx.cfr;
+package run.slicer.cfr;
 
 import org.teavm.jso.JSBody;
 import org.teavm.jso.JSObject;

src/main/java/dev/cephx/cfr/impl/ClassFileSourceImpl.java → src/main/java/run/slicer/cfr/impl/ClassFileSourceImpl.java

@@ -1,4 +1,4 @@
-package dev.cephx.cfr.impl;
+package run.slicer.cfr.impl;
 
 import org.benf.cfr.reader.api.ClassFileSource;
 import org.benf.cfr.reader.bytecode.analysis.parse.utils.Pair;

src/main/java/dev/cephx/cfr/impl/OutputSinkFactoryImpl.java → src/main/java/run/slicer/cfr/impl/OutputSinkFactoryImpl.java

@@ -1,4 +1,4 @@
-package dev.cephx.cfr.impl;
+package run.slicer.cfr.impl;
 
 import org.benf.cfr.reader.api.OutputSinkFactory;
 

src/teavm/java/dev/cephx/cfr/teavm/CFRPlugin.java → src/teavm/java/run/slicer/cfr/teavm/CFRPlugin.java

@@ -1,4 +1,4 @@
-package dev.cephx.cfr.teavm;
+package run.slicer.cfr.teavm;
 
 import org.teavm.vm.spi.TeaVMHost;
 import org.teavm.vm.spi.TeaVMPlugin;

src/teavm/java/dev/cephx/cfr/teavm/MethodStubTransformer.java → src/teavm/java/run/slicer/cfr/teavm/MethodStubTransformer.java

@@ -1,4 +1,4 @@
-package dev.cephx.cfr.teavm;
+package run.slicer.cfr.teavm;
 
 import org.teavm.model.*;
 import org.teavm.model.instructions.ExitInstruction;

src/teavm/java/run/slicer/cfr/teavm/classlib/java/util/logging/THandler.java

@@ -0,0 +1,4 @@
+package run.slicer.cfr.teavm.classlib.java.util.logging;
+
+public abstract class THandler {
+}

src/teavm/java/dev/cephx/cfr/teavm/classlib/java/util/logging/TLogger.java → src/teavm/java/run/slicer/cfr/teavm/classlib/java/util/logging/TLogger.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package dev.cephx.cfr.teavm.classlib.java.util.logging;
+package run.slicer.cfr.teavm.classlib.java.util.logging;
 
 import java.util.function.Supplier;
 import org.teavm.classlib.PlatformDetector;

src/teavm/resources/META-INF/services/org.teavm.vm.spi.TeaVMPlugin

@@ -1 +1 @@
-dev.cephx.cfr.teavm.CFRPlugin
+run.slicer.cfr.teavm.CFRPlugin

src/teavm/resources/META-INF/teavm.properties

@@ -1,2 +1,2 @@
-mapClass|dev.cephx.cfr.teavm.classlib.java.util.logging.TLogger=java.util.logging.Logger
-mapClass|dev.cephx.cfr.teavm.classlib.java.util.logging.THandler=java.util.logging.Handler
+mapClass|run.slicer.cfr.teavm.classlib.java.util.logging.TLogger=java.util.logging.Logger
+mapClass|run.slicer.cfr.teavm.classlib.java.util.logging.THandler=java.util.logging.Handler