Skip to content

Commit b5683b3

Browse files
MTechLabDevMTechLabDev
authored
Merge branch 'SparkUniverse:master' into master
2 parents a825d23 + bfa9cbe commit b5683b3

57 files changed

Lines changed: 1545 additions & 703 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ jobs:
2020
distribution: temurin
2121
java-version: |
2222
8
23-
16
24-
17
23+
21
2524
2625
# Can't use setup-java for this because https://github.com/actions/setup-java/issues/366
2726
- uses: actions/cache@v4

‎api/Elementa.api‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ public final class gg/essential/elementa/ElementaVersion : java/lang/Enum {
33
public static final field V0 Lgg/essential/elementa/ElementaVersion;
44
public static final field V1 Lgg/essential/elementa/ElementaVersion;
55
public static final field V10 Lgg/essential/elementa/ElementaVersion;
6+
public static final field V11 Lgg/essential/elementa/ElementaVersion;
67
public static final field V2 Lgg/essential/elementa/ElementaVersion;
78
public static final field V3 Lgg/essential/elementa/ElementaVersion;
89
public static final field V4 Lgg/essential/elementa/ElementaVersion;
@@ -12,6 +13,7 @@ public final class gg/essential/elementa/ElementaVersion : java/lang/Enum {
1213
public static final field V8 Lgg/essential/elementa/ElementaVersion;
1314
public static final field V9 Lgg/essential/elementa/ElementaVersion;
1415
public final fun enableFor (Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
16+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
1517
public static fun valueOf (Ljava/lang/String;)Lgg/essential/elementa/ElementaVersion;
1618
public static fun values ()[Lgg/essential/elementa/ElementaVersion;
1719
}
@@ -117,6 +119,7 @@ public abstract class gg/essential/elementa/UIComponent : java/util/Observable,
117119
public fun mouseMove (Lgg/essential/elementa/components/Window;)V
118120
public fun mouseRelease ()V
119121
public fun mouseScroll (D)V
122+
public fun mouseScroll (DD)V
120123
public final fun onFocus (Lkotlin/jvm/functions/Function1;)Lgg/essential/elementa/UIComponent;
121124
public final fun onFocusLost (Lkotlin/jvm/functions/Function1;)Lgg/essential/elementa/UIComponent;
122125
public final fun onKeyType (Lkotlin/jvm/functions/Function3;)Lgg/essential/elementa/UIComponent;
@@ -178,11 +181,6 @@ public final class gg/essential/elementa/UIComponent$Companion {
178181
public final fun guiHint (FZ)F
179182
}
180183

181-
public final class gg/essential/elementa/UIComponent$sam$i$java_util_function_Predicate$0 : java/util/function/Predicate {
182-
public fun <init> (Lkotlin/jvm/functions/Function1;)V
183-
public final synthetic fun test (Ljava/lang/Object;)Z
184-
}
185-
186184
public class gg/essential/elementa/UIConstraints : java/util/Observable {
187185
public fun <init> (Lgg/essential/elementa/UIComponent;)V
188186
public final fun copy ()Lgg/essential/elementa/UIConstraints;
@@ -277,6 +275,7 @@ public abstract class gg/essential/elementa/WindowScreen : gg/essential/universa
277275
public fun onMouseClicked (DDI)V
278276
public fun onMouseReleased (DDI)V
279277
public fun onMouseScrolled (D)V
278+
public fun onMouseScrolled (DDDD)V
280279
public fun onScreenClose ()V
281280
public final fun stopAnimating (Lkotlin/reflect/KMutableProperty0;)V
282281
}
@@ -328,6 +327,7 @@ public final class gg/essential/elementa/components/GradientComponent$GradientDi
328327
public static final field LEFT_TO_RIGHT Lgg/essential/elementa/components/GradientComponent$GradientDirection;
329328
public static final field RIGHT_TO_LEFT Lgg/essential/elementa/components/GradientComponent$GradientDirection;
330329
public static final field TOP_TO_BOTTOM Lgg/essential/elementa/components/GradientComponent$GradientDirection;
330+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
331331
public final fun getGradientColors (Ljava/awt/Color;Ljava/awt/Color;)Lgg/essential/elementa/components/GradientComponent$GradientColors;
332332
public static fun valueOf (Ljava/lang/String;)Lgg/essential/elementa/components/GradientComponent$GradientDirection;
333333
public static fun values ()[Lgg/essential/elementa/components/GradientComponent$GradientDirection;
@@ -430,6 +430,7 @@ public final class gg/essential/elementa/components/ScrollComponent$Direction :
430430
public static final field PreferHorizontal Lgg/essential/elementa/components/ScrollComponent$Direction;
431431
public static final field PreferVertical Lgg/essential/elementa/components/ScrollComponent$Direction;
432432
public static final field Vertical Lgg/essential/elementa/components/ScrollComponent$Direction;
433+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
433434
public static fun valueOf (Ljava/lang/String;)Lgg/essential/elementa/components/ScrollComponent$Direction;
434435
public static fun values ()[Lgg/essential/elementa/components/ScrollComponent$Direction;
435436
}
@@ -640,6 +641,7 @@ public final class gg/essential/elementa/components/UIImage$TextureScalingMode :
640641
public static final field NEAREST Lgg/essential/elementa/components/UIImage$TextureScalingMode;
641642
public static final field NEAREST_MIPMAP_LINEAR Lgg/essential/elementa/components/UIImage$TextureScalingMode;
642643
public static final field NEAREST_MIPMAP_NEAREST Lgg/essential/elementa/components/UIImage$TextureScalingMode;
644+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
643645
public static fun valueOf (Ljava/lang/String;)Lgg/essential/elementa/components/UIImage$TextureScalingMode;
644646
public static fun values ()[Lgg/essential/elementa/components/UIImage$TextureScalingMode;
645647
}
@@ -777,6 +779,7 @@ public final class gg/essential/elementa/components/Window : gg/essential/elemen
777779
public fun mouseClick (DDI)V
778780
public fun mouseRelease ()V
779781
public fun mouseScroll (D)V
782+
public fun mouseScroll (DD)V
780783
public final fun removeFloatingComponent (Lgg/essential/elementa/UIComponent;)V
781784
public final fun setHoveredFloatingComponent (Lgg/essential/elementa/UIComponent;)V
782785
public final fun unfocus ()V
@@ -977,6 +980,7 @@ protected final class gg/essential/elementa/components/input/AbstractTextInput$A
977980
public final class gg/essential/elementa/components/input/AbstractTextInput$Direction : java/lang/Enum {
978981
public static final field Left Lgg/essential/elementa/components/input/AbstractTextInput$Direction;
979982
public static final field Right Lgg/essential/elementa/components/input/AbstractTextInput$Direction;
983+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
980984
public static fun valueOf (Ljava/lang/String;)Lgg/essential/elementa/components/input/AbstractTextInput$Direction;
981985
public static fun values ()[Lgg/essential/elementa/components/input/AbstractTextInput$Direction;
982986
}
@@ -1029,6 +1033,7 @@ public final class gg/essential/elementa/components/input/AbstractTextInput$Sele
10291033
public static final field Line Lgg/essential/elementa/components/input/AbstractTextInput$SelectionMode;
10301034
public static final field None Lgg/essential/elementa/components/input/AbstractTextInput$SelectionMode;
10311035
public static final field Word Lgg/essential/elementa/components/input/AbstractTextInput$SelectionMode;
1036+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
10321037
public static fun valueOf (Ljava/lang/String;)Lgg/essential/elementa/components/input/AbstractTextInput$SelectionMode;
10331038
public static fun values ()[Lgg/essential/elementa/components/input/AbstractTextInput$SelectionMode;
10341039
}
@@ -1231,6 +1236,7 @@ public final class gg/essential/elementa/components/plot/LineStyle {
12311236
public final class gg/essential/elementa/components/plot/LineType : java/lang/Enum {
12321237
public static final field Linear Lgg/essential/elementa/components/plot/LineType;
12331238
public final fun draw (Ljava/util/List;Ljava/awt/Color;F)V
1239+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
12341240
public static fun valueOf (Ljava/lang/String;)Lgg/essential/elementa/components/plot/LineType;
12351241
public static fun values ()[Lgg/essential/elementa/components/plot/LineType;
12361242
}
@@ -1304,6 +1310,7 @@ public final class gg/essential/elementa/components/plot/PointStyle {
13041310
public final class gg/essential/elementa/components/plot/PointType : java/lang/Enum {
13051311
public static final field None Lgg/essential/elementa/components/plot/PointType;
13061312
public final fun draw (Ljava/util/List;Lgg/essential/elementa/components/plot/PlotStyle;)V
1313+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
13071314
public static fun valueOf (Ljava/lang/String;)Lgg/essential/elementa/components/plot/PointType;
13081315
public static fun values ()[Lgg/essential/elementa/components/plot/PointType;
13091316
}
@@ -1555,6 +1562,7 @@ public final class gg/essential/elementa/constraints/ConstraintType : java/lang/
15551562
public static final field WIDTH Lgg/essential/elementa/constraints/ConstraintType;
15561563
public static final field X Lgg/essential/elementa/constraints/ConstraintType;
15571564
public static final field Y Lgg/essential/elementa/constraints/ConstraintType;
1565+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
15581566
public final fun getPrettyName ()Ljava/lang/String;
15591567
public static fun valueOf (Ljava/lang/String;)Lgg/essential/elementa/constraints/ConstraintType;
15601568
public static fun values ()[Lgg/essential/elementa/constraints/ConstraintType;
@@ -1966,6 +1974,7 @@ public final class gg/essential/elementa/constraints/RoundingConstraint$Mode : j
19661974
public static final field Ceil Lgg/essential/elementa/constraints/RoundingConstraint$Mode;
19671975
public static final field Floor Lgg/essential/elementa/constraints/RoundingConstraint$Mode;
19681976
public static final field Round Lgg/essential/elementa/constraints/RoundingConstraint$Mode;
1977+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
19691978
public static fun valueOf (Ljava/lang/String;)Lgg/essential/elementa/constraints/RoundingConstraint$Mode;
19701979
public static fun values ()[Lgg/essential/elementa/constraints/RoundingConstraint$Mode;
19711980
}
@@ -2251,6 +2260,7 @@ public abstract class gg/essential/elementa/constraints/animation/Animations : j
22512260
public static final field OUT_QUINT Lgg/essential/elementa/constraints/animation/Animations;
22522261
public static final field OUT_SIN Lgg/essential/elementa/constraints/animation/Animations;
22532262
public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
2263+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
22542264
public static fun valueOf (Ljava/lang/String;)Lgg/essential/elementa/constraints/animation/Animations;
22552265
public static fun values ()[Lgg/essential/elementa/constraints/animation/Animations;
22562266
}
@@ -2644,6 +2654,7 @@ public final class gg/essential/elementa/effects/OutlineEffect$Side : java/lang/
26442654
public static final field Left Lgg/essential/elementa/effects/OutlineEffect$Side;
26452655
public static final field Right Lgg/essential/elementa/effects/OutlineEffect$Side;
26462656
public static final field Top Lgg/essential/elementa/effects/OutlineEffect$Side;
2657+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
26472658
public static fun valueOf (Ljava/lang/String;)Lgg/essential/elementa/effects/OutlineEffect$Side;
26482659
public static fun values ()[Lgg/essential/elementa/effects/OutlineEffect$Side;
26492660
}
@@ -2740,15 +2751,22 @@ public abstract class gg/essential/elementa/events/UIEvent {
27402751
}
27412752

27422753
public final class gg/essential/elementa/events/UIScrollEvent : gg/essential/elementa/events/UIEvent {
2754+
public fun <init> (DDLgg/essential/elementa/UIComponent;Lgg/essential/elementa/UIComponent;)V
27432755
public fun <init> (DLgg/essential/elementa/UIComponent;Lgg/essential/elementa/UIComponent;)V
2756+
public fun <init> (DLgg/essential/elementa/UIComponent;Lgg/essential/elementa/UIComponent;D)V
27442757
public final fun component1 ()D
27452758
public final fun component2 ()Lgg/essential/elementa/UIComponent;
27462759
public final fun component3 ()Lgg/essential/elementa/UIComponent;
2760+
public final fun component4 ()D
27472761
public final fun copy (DLgg/essential/elementa/UIComponent;Lgg/essential/elementa/UIComponent;)Lgg/essential/elementa/events/UIScrollEvent;
2762+
public final fun copy (DLgg/essential/elementa/UIComponent;Lgg/essential/elementa/UIComponent;D)Lgg/essential/elementa/events/UIScrollEvent;
2763+
public static synthetic fun copy$default (Lgg/essential/elementa/events/UIScrollEvent;DLgg/essential/elementa/UIComponent;Lgg/essential/elementa/UIComponent;DILjava/lang/Object;)Lgg/essential/elementa/events/UIScrollEvent;
27482764
public static synthetic fun copy$default (Lgg/essential/elementa/events/UIScrollEvent;DLgg/essential/elementa/UIComponent;Lgg/essential/elementa/UIComponent;ILjava/lang/Object;)Lgg/essential/elementa/events/UIScrollEvent;
27492765
public fun equals (Ljava/lang/Object;)Z
27502766
public final fun getCurrentTarget ()Lgg/essential/elementa/UIComponent;
27512767
public final fun getDelta ()D
2768+
public final fun getScrollX ()D
2769+
public final fun getScrollY ()D
27522770
public final fun getTarget ()Lgg/essential/elementa/UIComponent;
27532771
public fun hashCode ()I
27542772
public fun toString ()Ljava/lang/String;
@@ -3539,6 +3557,7 @@ public final class gg/essential/elementa/markdown/drawables/DrawableList$Directi
35393557
public static final field Left Lgg/essential/elementa/markdown/drawables/DrawableList$Direction;
35403558
public static final field Right Lgg/essential/elementa/markdown/drawables/DrawableList$Direction;
35413559
public static final field Up Lgg/essential/elementa/markdown/drawables/DrawableList$Direction;
3560+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
35423561
public static fun valueOf (Ljava/lang/String;)Lgg/essential/elementa/markdown/drawables/DrawableList$Direction;
35433562
public static fun values ()[Lgg/essential/elementa/markdown/drawables/DrawableList$Direction;
35443563
}

‎build.gradle.kts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import gg.essential.gradle.multiversion.StripReferencesTransform.Companion.registerStripReferencesAttribute
22
import gg.essential.gradle.util.*
33
import gg.essential.gradle.util.RelocationTransform.Companion.registerRelocationAttribute
4-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
4+
import org.jetbrains.kotlin.gradle.dsl.JvmDefaultMode
5+
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
56

67
plugins {
7-
kotlin("jvm") version "1.9.23"
8+
kotlin("jvm") version "2.3.0"
89
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.8.0"
910
id("org.jetbrains.dokka") version "1.9.20"
1011
id("gg.essential.defaults")
@@ -18,11 +19,11 @@ kotlin.jvmToolchain {
1819
(this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(8))
1920
}
2021

21-
tasks.withType<KotlinCompile> {
22-
setJvmDefault("all-compatibility")
23-
kotlinOptions {
24-
languageVersion = "1.6"
25-
apiVersion = "1.6"
22+
kotlin {
23+
compilerOptions {
24+
languageVersion = KotlinVersion.KOTLIN_1_9
25+
apiVersion = KotlinVersion.KOTLIN_1_9
26+
jvmDefault = JvmDefaultMode.NO_COMPATIBILITY
2627
}
2728
}
2829

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[versions]
2-
kotlin = "1.5.10"
2+
kotlin = "1.9.25"
33
kotlinx-coroutines = "1.5.2"
44
jetbrains-annotations = "23.0.0"
5-
universalcraft = "406"
5+
universalcraft = "466"
66
commonmark = "0.17.1"
77
dom4j = "2.1.1"
88

‎gradle/wrapper/gradle-wrapper.jar‎

-10 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)