Skip to content

Commit 0947c11

Browse files
SyrentSyrent
committed
build: release 1.9.2.26
1 parent 65bd62e commit 0947c11

8 files changed

Lines changed: 56 additions & 30 deletions

File tree

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77

88
allprojects {
99
group = "org.sayandev"
10-
version = "1.9.2.13"
10+
version = "1.9.2.26"
1111
description = "A modular Kotlin framework for Minecraft: JE"
1212

1313
plugins.apply("maven-publish")

‎gradle/libs.versions.toml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ configurate = "4.1.2"
1010
cloud = "2.0.0"
1111
cloud-platform = "2.0.0-beta.10"
1212
#cloud-minecraft = "2.0.2-SNAPSHOT"
13-
adventure = "4.21.0"
13+
adventure = "4.20.0"
1414
mysql-connector = "8.4.0"
1515
sqlite-jdbc = "3.46.0.0"
1616
h2 = "2.2.224"
@@ -22,14 +22,14 @@ guava = "31.1-jre"
2222
gson = "2.11.0"
2323
kotlin-reflect = "2.1.20"
2424
netty = "4.1.111.Final"
25-
exposed = "0.61.0"
25+
exposed = "1.0.0-beta-2"
2626
libby = "2.0.0-SNAPSHOT"
2727
mccoroutines = "2.20.0"
2828
kotlinx-coroutines = "1.10.1"
2929
caffeine = "3.2.0"
3030

3131
# minecraft
32-
adventure-platform = "4.4.0"
32+
adventure-platform = "4.3.4"
3333

3434
# bukkit
3535
paper = "1.21-R0.1-SNAPSHOT"
@@ -76,6 +76,7 @@ kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", vers
7676
netty-all = { group = "io.netty", name = "netty-all", version.ref = "netty" }
7777
exposed-core = { group = "org.jetbrains.exposed", name = "exposed-core", version.ref = "exposed" }
7878
exposed-jdbc = { group = "org.jetbrains.exposed", name = "exposed-jdbc",version.ref = "exposed" }
79+
exposed-r2dbc = { group = "org.jetbrains.exposed", name = "exposed-r2dbc",version.ref = "exposed" }
7980
exposed-dao = { group = "org.jetbrains.exposed", name = "exposed-dao",version.ref = "exposed" }
8081
exposed-kotlin-datetime = { group = "org.jetbrains.exposed", name = "exposed-kotlin-datetime",version.ref = "exposed" }
8182
libby = { group = "com.alessiodp.libby", name = "libby-core", version.ref = "libby" }
@@ -166,6 +167,7 @@ implementation-core = [
166167
"gson",
167168
"exposed-core",
168169
"exposed-jdbc",
170+
"exposed-r2dbc",
169171
"exposed-dao",
170172
"exposed-kotlin-datetime",
171173
"kotlinx-coroutines",

‎stickynote-core/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ dependencies {
1818
api(libs.mariadb)
1919
api(libs.exposed.core)
2020
api(libs.exposed.jdbc)
21+
api(libs.exposed.r2dbc)
2122
api(libs.exposed.dao)
2223
api(libs.exposed.kotlin.datetime)
2324

‎stickynote-loader/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
api(libs.kotlin.poet.java)
1414

1515
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.0.0-beta12")
16-
compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.1.20")
16+
implementation("org.jetbrains.kotlin:kotlin-stdlib:2.1.20")
1717
testImplementation(kotlin("test"))
1818
}
1919

‎stickynote-loader/src/main/kotlin/org/sayandev/plugin/StickyNoteProjectPlugin.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class StickyNoteProjectPlugin : Plugin<Project> {
1616
* Exclude dependency from relocations. should be the same in StickyNoteLoader
1717
* @see org.sayandev.loader.common.StickyNoteLoader
1818
* */
19-
val relocateExclusion = setOf("kotlin-stdlib", "kotlin-reflect", "kotlin", "kotlin-stdlib-jdk8", "kotlin-stdlib-jdk7", "kotlinx", "kotlinx-coroutines", "kotlinx-coroutines-core-jvm", "takenaka", "mappings", "gson")
19+
val relocateExclusion = setOf("kotlin-stdlib", "kotlin-reflect", "kotlin", "kotlin-stdlib-jdk8", "kotlin-stdlib-jdk7", "kotlinx", "kotlinx-coroutines", "kotlinx-coroutines-core-jvm", "takenaka", "mappings", "gson", "exposed", "adventure")
2020

2121
@KotlinPoetJavaPoetPreview
2222
override fun apply(target: Project) {
@@ -134,9 +134,10 @@ class StickyNoteProjectPlugin : Plugin<Project> {
134134
relocate("org.sayandev.loader", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.loader")
135135
relocate("org.sayandev.stickynote", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.stickynote")
136136
relocate("com.mysql", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.mysql")
137+
// relocate("kotlin", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.kotlin")
137138
// relocate("org.sqlite", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.sqlite")
138139
relocate("kotlinx.coroutines", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.kotlinx.coroutines")
139-
relocate("org.jetbrains.exposed", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.exposed")
140+
// relocate("org.jetbrains.exposed", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.exposed")
140141
// relocate("com.github.benmanes.caffeine", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.caffeine")
141142
for (bundleAlias in libs.bundleAliases.filter { config.modules.get().map { "implementation.".plus(it.type.artifact.removePrefix("stickynote-").replace("-", ".")) }.contains(it) }) {
142143
val bundle = libs.findBundle(bundleAlias).get().get()

‎stickynote-loader/stickynote-loader-common/src/main/java/org/sayandev/loader/common/Dependency.java‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
import org.jetbrains.annotations.Nullable;
44

5-
import java.io.IOException;
6-
import java.io.ObjectInputStream;
7-
import java.io.ObjectOutputStream;
8-
import java.io.Serializable;
5+
import java.io.*;
96
import java.util.List;
107

118
public class Dependency implements Serializable {
@@ -81,15 +78,23 @@ private void writeObject(ObjectOutputStream oos) throws IOException {
8178
oos.writeUTF(group);
8279
oos.writeUTF(name);
8380
oos.writeUTF(version);
81+
oos.writeObject(relocation);
82+
oos.writeBoolean(stickyLoad);
8483
oos.writeBoolean(transitiveResolved);
8584
oos.writeObject(transitiveDependencies);
8685
}
8786

8887
private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
89-
this.group = ois.readUTF();
90-
this.name = ois.readUTF();
91-
this.version = ois.readUTF();
92-
this.transitiveResolved = ois.readBoolean();
93-
this.transitiveDependencies = (List<Dependency>) ois.readObject();
88+
try {
89+
this.group = ois.readUTF();
90+
this.name = ois.readUTF();
91+
this.version = ois.readUTF();
92+
this.relocation = (String) ois.readObject();
93+
this.stickyLoad = ois.readBoolean();
94+
this.transitiveResolved = ois.readBoolean();
95+
this.transitiveDependencies = (List<Dependency>) ois.readObject();
96+
} catch (OptionalDataException e) {
97+
// Probably an old cache file with missing fields
98+
}
9499
}
95100
}

‎stickynote-loader/stickynote-loader-common/src/main/java/org/sayandev/loader/common/DependencyCache.java‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,34 @@ public DependencyCache(String project, File dataFolder) {
1717
}
1818

1919
public Set<Dependency> loadCache() {
20-
if (!cacheFile.exists()) {
20+
if (!cacheFile.exists() || cacheFile.length() == 0) {
2121
return new HashSet<>();
2222
}
2323

2424
try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(cacheFile))) {
25-
return (Set<Dependency>) ois.readObject();
25+
Object obj = ois.readObject();
26+
if (obj instanceof Set<?>) {
27+
return handleDeserializedSet((Set<?>) obj);
28+
}
29+
return new HashSet<>();
2630
} catch (IOException | ClassNotFoundException e) {
31+
// If we encounter corruption, delete the cache file to prevent future errors
32+
cacheFile.delete();
2733
e.printStackTrace();
2834
return new HashSet<>();
2935
}
3036
}
3137

38+
private Set<Dependency> handleDeserializedSet(Set<?> set) {
39+
Set<Dependency> result = new HashSet<>();
40+
for (Object o : set) {
41+
if (o instanceof Dependency) {
42+
result.add((Dependency) o);
43+
}
44+
}
45+
return result;
46+
}
47+
3248
public void saveCache(Set<Dependency> dependencies) {
3349
if (!cacheFile.exists()) {
3450
try {
@@ -49,24 +65,21 @@ public void saveCache(Set<Dependency> dependencies) {
4965

5066

5167
public Set<Dependency> loadCacheFromFile(File cacheFile) {
52-
Set<Dependency> cache = new HashSet<>();
5368
if (!cacheFile.exists() || cacheFile.length() == 0) {
54-
return cache;
69+
return new HashSet<>();
5570
}
71+
5672
try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(cacheFile))) {
5773
Object obj = ois.readObject();
5874
if (obj instanceof Set<?>) {
59-
Set<?> set = (Set<?>) obj;
60-
for (Object o : set) {
61-
if (o instanceof Dependency) {
62-
cache.add((Dependency) o);
63-
}
64-
}
75+
return handleDeserializedSet((Set<?>) obj);
6576
}
77+
return new HashSet<>();
6678
} catch (Exception e) {
79+
// Delete corrupted cache files
80+
cacheFile.delete();
6781
e.printStackTrace();
68-
// Optionally: cacheFile.delete();
82+
return new HashSet<>();
6983
}
70-
return cache;
7184
}
7285
}

‎stickynote-loader/stickynote-loader-common/src/main/java/org/sayandev/loader/common/StickyNoteLoader.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public abstract class StickyNoteLoader {
1919
private static final ConcurrentHashMap<Dependency, CompletableFuture<Void>> loadingLibraries = new ConcurrentHashMap<>();
2020
private static final ExecutorService executorService = Executors.newWorkStealingPool(Runtime.getRuntime().availableProcessors());
2121
private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
22-
public static final List<String> exclusions = Arrays.asList("kotlin-stdlib", "kotlin-reflect", "kotlin", "kotlin-stdlib-jdk8", "kotlin-stdlib-jdk7", "kotlinx", "kotlinx-coroutines", "kotlinx-coroutines-core-jvm", "takenaka", "mappings", "gson");
22+
public static final List<String> exclusions = Arrays.asList("kotlin-stdlib", "kotlin-reflect", "kotlin", "kotlin-stdlib-jdk8", "kotlin-stdlib-jdk7", "kotlinx", "kotlinx-coroutines", "kotlinx-coroutines-core-jvm", "takenaka", "mappings", "gson", "exposed", "adventure");
2323
public static final Map<String, String> relocations = new HashMap<>();
2424

2525
private final List<String> transitiveExcluded = Arrays.asList("xseries", "stickynote");
@@ -55,9 +55,13 @@ public void load(String id, File dataDirectory, Logger logger, LibraryManager li
5555
TransitiveDependencyHelper transitiveDependencyHelper = new TransitiveDependencyHelper(libraryManager, libDirectory.toPath());
5656

5757
relocations.put("com{}mysql", relocationTo + "{}lib{}mysql");
58+
/*String kot = "kot";
59+
String lin = "lon";
60+
relocations.put(kot + lin.replace("o", "i"), relocationTo + "{}lib{}kotlin");*/
61+
5862
// relocations.put("org{}sqlite", relocationTo + "{}lib{}sqlite");
5963
relocations.put("kotlinx{}coroutines", relocationTo + "{}lib{}kotlinx{}coroutines");
60-
relocations.put("org{}jetbrains{}exposed", relocationTo + "{}lib{}exposed");
64+
// relocations.put("org{}jetbrains{}exposed", relocationTo + "{}lib{}exposed");
6165

6266
DependencyCache dependencyCache = new DependencyCache(id, libDirectory);
6367
Set<Dependency> cachedDependencies = new HashSet<>(dependencyCache.loadCache());

0 commit comments

Comments
 (0)