Skip to content

Commit 5aca7cc

Browse files
makeevrsergmakeevrserg
committed
fix modules gradle
1 parent bfdde95 commit 5aca7cc

16 files changed

Lines changed: 232 additions & 216 deletions

File tree

‎build.gradle.kts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ plugins {
44
`java-library`
55
alias(libs.plugins.kotlin.jvm) apply false
66
alias(libs.plugins.kotlin.serialization) apply false
7-
alias(libs.plugins.minecraft.fabric.loom) apply false
87
alias(libs.plugins.gradle.buildconfig) apply false
9-
alias(libs.plugins.gradle.shadow) apply false
108

119
// klibs - core
1210
alias(libs.plugins.klibs.gradle.detekt) apply false
@@ -16,7 +14,6 @@ plugins {
1614
alias(libs.plugins.klibs.gradle.java.core) apply false
1715
alias(libs.plugins.klibs.gradle.publication) apply false
1816
alias(libs.plugins.klibs.gradle.rootinfo) apply false
19-
alias(libs.plugins.klibs.minecraft.shadow) apply false
2017
alias(libs.plugins.klibs.minecraft.resource.processor) apply false
2118
}
2219

‎gradle/libs.versions.toml‎

Lines changed: 139 additions & 121 deletions
Large diffs are not rendered by default.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎instances/bukkit/build.gradle.kts‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt
33
plugins {
44
kotlin("jvm")
55
alias(libs.plugins.klibs.gradle.java.core)
6-
alias(libs.plugins.klibs.minecraft.shadow)
76
alias(libs.plugins.klibs.minecraft.resource.processor)
87
}
98

109
dependencies {
1110
// Kotlin
12-
implementation(libs.bundles.kotlin)
11+
implementation(libs.kotlin.coroutines.core)
12+
implementation(libs.kotlin.serialization.json)
13+
implementation(libs.kotlin.serialization.kaml)
1314
// AstraLibs
1415
implementation(libs.minecraft.astralibs.core)
1516
implementation(libs.minecraft.astralibs.command)
@@ -31,26 +32,26 @@ minecraftProcessResource {
3132
bukkit()
3233
}
3334

34-
astraShadowJar {
35-
requireShadowJarTask {
36-
destination = File("/home/makeevrserg/Desktop/git/AstraTemplate/build/bukkit/plugins/")
37-
.takeIf { it.exists() }
38-
?: File(rootDir, "jars")
39-
40-
val projectInfo = requireProjectInfo
41-
isReproducibleFileOrder = true
42-
mergeServiceFiles()
43-
dependsOn(configurations)
44-
archiveClassifier.set(null as String?)
45-
relocate("org.bstats", projectInfo.group)
46-
47-
minimize {
48-
exclude(dependency(libs.exposed.jdbc.get()))
49-
exclude(dependency(libs.exposed.dao.get()))
50-
exclude(dependency("org.jetbrains.kotlin:kotlin-stdlib:${libs.versions.kotlin.version.get()}"))
51-
}
52-
archiveVersion.set(projectInfo.versionString)
53-
archiveBaseName.set("${projectInfo.name}-bukkit")
54-
destinationDirectory.set(destination.get())
55-
}
56-
}
35+
//astraShadowJar {
36+
// requireShadowJarTask {
37+
// destination = File("/home/makeevrserg/Desktop/git/AstraTemplate/build/bukkit/plugins/")
38+
// .takeIf { it.exists() }
39+
// ?: File(rootDir, "jars")
40+
//
41+
// val projectInfo = requireProjectInfo
42+
// isReproducibleFileOrder = true
43+
// mergeServiceFiles()
44+
// dependsOn(configurations)
45+
// archiveClassifier.set(null as String?)
46+
// relocate("org.bstats", projectInfo.group)
47+
//
48+
// minimize {
49+
// exclude(dependency(libs.exposed.jdbc.get()))
50+
// exclude(dependency(libs.exposed.dao.get()))
51+
// exclude(dependency("org.jetbrains.kotlin:kotlin-stdlib:${libs.versions.kotlin.version.get()}"))
52+
// }
53+
// archiveVersion.set(projectInfo.versionString)
54+
// archiveBaseName.set("${projectInfo.name}-bukkit")
55+
// destinationDirectory.set(destination.get())
56+
// }
57+
//}

‎instances/fabric/build.gradle.kts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@ import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt
44

55
plugins {
66
kotlin("jvm")
7-
id("fabric-loom")
7+
alias(libs.plugins.fabric.loom)
88
alias(libs.plugins.gradle.shadow)
99
alias(libs.plugins.klibs.gradle.java.core)
10-
alias(libs.plugins.klibs.minecraft.shadow)
1110
alias(libs.plugins.klibs.minecraft.resource.processor)
1211
}
1312

1413
dependencies {
14+
minecraft(libs.minecraft.fabric.mojang.get())
1515
mappings("net.fabricmc:yarn:${libs.versions.minecraft.fabric.yarn.get()}:v2")
16-
minecraft(libs.minecraft.mojang.get())
1716
modImplementation(libs.minecraft.fabric.kotlin.get())
1817
modImplementation(libs.minecraft.fabric.loader.get())
1918
modImplementation(libs.minecraft.fabric.api.get())
@@ -24,7 +23,9 @@ dependencies {
2423
implementation(libs.klibs.kstorage)
2524
implementation(libs.klibs.mikro.core)
2625
// Kotlin
27-
implementation(libs.bundles.kotlin)
26+
implementation(libs.kotlin.coroutines.core)
27+
implementation(libs.kotlin.serialization.json)
28+
implementation(libs.kotlin.serialization.kaml)
2829
// Driver
2930
implementation(libs.driver.jdbc)
3031
// Local

‎instances/forge/build.gradle.kts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ dependencies {
2424
shade(libs.minecraft.astralibs.command)
2525
shade(libs.klibs.kstorage)
2626
// Kotlin
27-
shade(libs.bundles.kotlin)
27+
implementation(libs.kotlin.coroutines.core)
28+
implementation(libs.kotlin.serialization.json)
29+
implementation(libs.kotlin.serialization.kaml)
2830
// Local
2931
shade(projects.modules.apiLocal)
3032
shade(projects.modules.apiRemote)

‎instances/velocity/build.gradle.kts‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ plugins {
44
kotlin("jvm")
55
alias(libs.plugins.gradle.shadow)
66
alias(libs.plugins.gradle.buildconfig)
7-
alias(libs.plugins.klibs.minecraft.shadow)
87
alias(libs.plugins.klibs.minecraft.resource.processor)
98
}
109

1110
dependencies {
12-
implementation(libs.bundles.kotlin)
11+
implementation(libs.kotlin.coroutines.core)
12+
implementation(libs.kotlin.serialization.json)
13+
implementation(libs.kotlin.serialization.kaml)
1314
// AstraLibs
1415
implementation(libs.minecraft.astralibs.core)
1516
implementation(libs.minecraft.astralibs.command)
@@ -26,26 +27,26 @@ minecraftProcessResource {
2627
velocity()
2728
}
2829

29-
astraShadowJar {
30-
requireShadowJarTask {
31-
destination = File("/home/makeevrserg/Desktop/server/data/plugins")
32-
.takeIf { it.exists() }
33-
?: File(rootDir, "jars")
34-
35-
val projectInfo = requireProjectInfo
36-
isReproducibleFileOrder = true
37-
mergeServiceFiles()
38-
dependsOn(configurations)
39-
archiveClassifier.set(null as String?)
40-
relocate("org.bstats", projectInfo.group)
41-
42-
minimize {
43-
exclude(dependency(libs.exposed.jdbc.get()))
44-
exclude(dependency(libs.exposed.dao.get()))
45-
exclude(dependency("org.jetbrains.kotlin:kotlin-stdlib:${libs.versions.kotlin.version.get()}"))
46-
}
47-
archiveVersion.set(projectInfo.versionString)
48-
archiveBaseName.set("${projectInfo.name}-velocity")
49-
destinationDirectory.set(destination.get())
50-
}
51-
}
30+
// astraShadowJar {
31+
// requireShadowJarTask {
32+
// destination = File("/home/makeevrserg/Desktop/server/data/plugins")
33+
// .takeIf { it.exists() }
34+
// ?: File(rootDir, "jars")
35+
//
36+
// val projectInfo = requireProjectInfo
37+
// isReproducibleFileOrder = true
38+
// mergeServiceFiles()
39+
// dependsOn(configurations)
40+
// archiveClassifier.set(null as String?)
41+
// relocate("org.bstats", projectInfo.group)
42+
//
43+
// minimize {
44+
// exclude(dependency(libs.exposed.jdbc.get()))
45+
// exclude(dependency(libs.exposed.dao.get()))
46+
// exclude(dependency("org.jetbrains.kotlin:kotlin-stdlib:${libs.versions.kotlin.version.get()}"))
47+
// }
48+
// archiveVersion.set(projectInfo.versionString)
49+
// archiveBaseName.set("${projectInfo.name}-velocity")
50+
// destinationDirectory.set(destination.get())
51+
// }
52+
//}

‎modules/api-local/build.gradle.kts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ plugins {
33
}
44

55
dependencies {
6-
// Kotlin
7-
implementation(libs.bundles.kotlin)
8-
// AstraLibs
6+
implementation(libs.kotlin.coroutines.core)
7+
implementation(libs.kotlin.serialization.json)
8+
implementation(libs.kotlin.serialization.kaml)
9+
910
implementation(libs.minecraft.astralibs.core)
10-
implementation(libs.minecraft.astralibs.exposed)
11-
// mikro
11+
1212
implementation(libs.klibs.kstorage)
13-
// Exposed
14-
implementation(libs.bundles.exposed)
15-
// klibs
1613
implementation(libs.klibs.mikro.core)
17-
// Local
14+
implementation(libs.klibs.mikro.extensions)
15+
16+
implementation(libs.exposed.core)
17+
1818
implementation(projects.modules.core)
1919
}

‎modules/api-local/src/main/kotlin/ru/astrainteractive/astratemplate/api/local/di/ApiLocalModule.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger
1313
import org.jetbrains.exposed.sql.addLogger
1414
import org.jetbrains.exposed.sql.transactions.TransactionManager
1515
import org.jetbrains.exposed.sql.transactions.transaction
16-
import ru.astrainteractive.astralibs.exposed.model.DatabaseConfiguration
17-
import ru.astrainteractive.astralibs.exposed.model.connect
1816
import ru.astrainteractive.astralibs.lifecycle.Lifecycle
1917
import ru.astrainteractive.astratemplate.api.local.dao.LocalDao
2018
import ru.astrainteractive.astratemplate.api.local.dao.LocalDaoImpl
@@ -23,20 +21,23 @@ import ru.astrainteractive.astratemplate.api.local.entity.UserTable
2321
import ru.astrainteractive.astratemplate.core.plugin.PluginConfiguration
2422
import ru.astrainteractive.klibs.mikro.core.coroutines.mapCached
2523
import java.io.File
24+
import ru.astrainteractive.klibs.mikro.exposed.model.DatabaseConfiguration
25+
import ru.astrainteractive.klibs.mikro.exposed.util.connect
2626

2727
class ApiLocalModule(
2828
dataFolder: File,
2929
configFlow: Flow<PluginConfiguration>,
3030
scope: CoroutineScope
3131
) {
32-
3332
private val databaseFlow = configFlow
3433
.map { it.database }
3534
.distinctUntilChanged()
3635
.mapCached(scope) { config, previous: Database? ->
3736
previous?.connector?.invoke()?.close()
3837
previous?.run(TransactionManager::closeAndUnregister)
39-
val database = DatabaseConfiguration.H2("users_db").connect(dataFolder)
38+
val database = dataFolder.resolve("users_db").absolutePath
39+
.let(DatabaseConfiguration::H2)
40+
.connect()
4041
TransactionManager.manager.defaultIsolationLevel = java.sql.Connection.TRANSACTION_SERIALIZABLE
4142
transaction(database) {
4243
addLogger(Slf4jSqlDebugLogger)

‎modules/api-remote/build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
}
55

66
dependencies {
7-
// Kotlin
8-
implementation(libs.bundles.kotlin)
7+
implementation(libs.kotlin.coroutines.core)
8+
implementation(libs.kotlin.serialization.json)
9+
implementation(libs.kotlin.serialization.kaml)
910
}

0 commit comments

Comments
 (0)