Skip to content

Commit f7325a7

Browse files
authored
Merge pull request #13 from Sayan-Development/fat
feat: create a fat stickynote version for publication
2 parents cbb075b + 2b96faf commit f7325a7

6 files changed

Lines changed: 13 additions & 8 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.8.10-fat-alpha2"
10+
version = "1.9.0"
1111
description = "A modular Kotlin framework for Minecraft: JE"
1212

1313
plugins.apply("maven-publish")

stickynote-core/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ dependencies {
1515
api(libs.gson)
1616
api(libs.kotlin.reflect)
1717
api(libs.kotlinx.coroutines)
18+
api(libs.mariadb)
19+
api(libs.exposed.core)
20+
api(libs.exposed.jdbc)
21+
api(libs.exposed.dao)
22+
api(libs.exposed.kotlin.datetime)
1823

1924
compileOnlyApi(libs.guava)
2025
compileOnlyApi(libs.netty.all)

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import com.squareup.kotlinpoet.javapoet.KotlinPoetJavaPoetPreview
55
import org.gradle.api.Plugin
66
import org.gradle.api.Project
77
import org.gradle.api.artifacts.VersionCatalogsExtension
8+
import org.gradle.api.file.DuplicatesStrategy
89
import org.gradle.api.plugins.JavaPluginExtension
910
import org.gradle.kotlin.dsl.*
1011

@@ -115,17 +116,13 @@ class StickyNoteProjectPlugin : Plugin<Project> {
115116
relocate("org.sayandev.loader", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.loader")
116117
relocate("org.sayandev.stickynote", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.stickynote")
117118
relocate("com.mysql", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.mysql")
118-
relocate("org.jetbrains.exposed", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.exposed")
119-
// relocate("kotlinx.coroutines", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.kotlinx.coroutines")
119+
// relocate("org.sqlite", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.sqlite")
120+
relocate("kotlinx.coroutines", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.kotlinx.coroutines")
120121
// relocate("com.github.benmanes.caffeine", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.caffeine")
121122
for (bundleAlias in libs.bundleAliases.filter { config.modules.get().map { "implementation.".plus(it.type.artifact.removePrefix("stickynote-").replace("-", ".")) }.contains(it) }) {
122123
val bundle = libs.findBundle(bundleAlias).get().get()
123124
for (alias in bundle) {
124125
if (relocateExclusion.any { alias.module.name == it }) continue
125-
if (alias.module.name.contains("packetevents")) {
126-
relocate("io.github.retrooper", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.packetevents")
127-
continue
128-
}
129126
// We DON'T relocate adventure to keep compatibility with local paper/velocity adventure api calls
130127
if (alias.module.name.contains("adventure")) {
131128
// relocate("net.kyori.adventure.text.serializer", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.adventure.text.serializer")
@@ -143,6 +140,7 @@ class StickyNoteProjectPlugin : Plugin<Project> {
143140
}
144141
}
145142
mergeServiceFiles()
143+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
146144
}
147145

148146
require(createStickyNoteLoader.loaderVersion.get() != "0.0.0") { "loaderVersion is not provided" }

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public void load(String id, File dataDirectory, Logger logger, LibraryManager li
6262
TransitiveDependencyHelper transitiveDependencyHelper = new TransitiveDependencyHelper(libraryManager, libDirectory.toPath());
6363

6464
relocations.put("com{}mysql", relocationTo + "{}lib{}mysql");
65+
// relocations.put("org{}sqlite", relocationTo + "{}lib{}sqlite");
6566
relocations.put("kotlinx{}coroutines", relocationTo + "{}lib{}kotlinx{}coroutines");
6667

6768
DependencyCache dependencyCache = new DependencyCache(id, libDirectory);

stickynote-loader/stickynote-loader-velocity/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ dependencies {
44
api(libs.libby.velocity)
55
api(libs.mccoroutines.velocity.api)
66
api(libs.mccoroutines.velocity.core)
7+
api(libs.sqlite.jdbc)
78

89
compileOnly(project(":stickynote-proxy"))
910
compileOnly(project(":stickynote-proxy:stickynote-proxy-velocity"))

stickynote-proxy/stickynote-proxy-velocity/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dependencies {
22
compileOnly(libs.velocity)
33
compileOnlyApi(libs.libby.velocity)
4-
compileOnlyApi(libs.cloud.velocity)
4+
api(libs.cloud.velocity)
55

66
api(libs.mccoroutines.velocity.api)
77
api(libs.mccoroutines.velocity.core)

0 commit comments

Comments
 (0)