Skip to content

Commit

Permalink
Bump idofront
Browse files Browse the repository at this point in the history
  • Loading branch information
0ffz committed Feb 15, 2024
1 parent 9b23333 commit bed6e37
Show file tree
Hide file tree
Showing 11 changed files with 59 additions and 59 deletions.
1 change: 1 addition & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
- uses: MineInAbyss/publish-action@master
with:
maven-metadata-url: https://repo.mineinabyss.com/releases/com/mineinabyss/geary-papermc-core/maven-metadata.xml
maven-snapshot-metadata-url: https://repo.mineinabyss.com/snapshots/com/mineinabyss/geary-papermc-core/maven-metadata.xml
# pages-path: build/dokka/htmlMultiModule/
# dokka: dokkaHtmlMultiModule
maven-username: ${{ secrets.MAVEN_PUBLISH_USERNAME }}
Expand Down
10 changes: 5 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ val idofrontVersion: String by project

plugins {
java
alias(libs.plugins.mia.publication)
alias(libs.plugins.mia.kotlin.jvm)
alias(libs.plugins.dokka) apply false
alias(libs.plugins.mia.autoversion)
alias(idofrontLibs.plugins.mia.publication)
alias(idofrontLibs.plugins.mia.kotlin.jvm)
alias(idofrontLibs.plugins.dokka) apply false
alias(idofrontLibs.plugins.mia.autoversion)
}

dependencies {
Expand Down Expand Up @@ -36,7 +36,7 @@ allprojects {
}

dependencies {
val libs = rootProject.libs
val libs = rootProject.idofrontLibs
compileOnly(libs.bundles.idofront.core)
testImplementation(libs.bundles.idofront.core)
}
Expand Down
22 changes: 11 additions & 11 deletions geary-papermc-bridge/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id(libs.plugins.mia.kotlin.jvm.get().pluginId)
id(libs.plugins.mia.papermc.get().pluginId)
id(libs.plugins.mia.publication.get().pluginId)
alias(libs.plugins.kotlinx.serialization)
id(idofrontLibs.plugins.mia.kotlin.jvm.get().pluginId)
id(idofrontLibs.plugins.mia.papermc.get().pluginId)
id(idofrontLibs.plugins.mia.publication.get().pluginId)
alias(idofrontLibs.plugins.kotlinx.serialization)
}

dependencies {
Expand All @@ -11,13 +11,13 @@ dependencies {
implementation(gearyLibs.autoscan)

// Plugins
compileOnly(myLibs.plugman)
compileOnly(libs.minecraft.plugin.mythic.dist)
compileOnly(libs.plugman)
compileOnly(idofrontLibs.minecraft.plugin.mythic.dist)

// MineInAbyss platform
compileOnly(libs.kotlin.stdlib)
compileOnly(libs.kotlinx.serialization.json)
compileOnly(libs.kotlinx.serialization.kaml)
compileOnly(libs.kotlinx.coroutines)
compileOnly(libs.minecraft.mccoroutine)
compileOnly(idofrontLibs.kotlin.stdlib)
compileOnly(idofrontLibs.kotlinx.serialization.json)
compileOnly(idofrontLibs.kotlinx.serialization.kaml)
compileOnly(idofrontLibs.kotlinx.coroutines)
compileOnly(idofrontLibs.minecraft.mccoroutine)
}
14 changes: 7 additions & 7 deletions geary-papermc-core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
plugins {
id(libs.plugins.mia.kotlin.jvm.get().pluginId)
id(libs.plugins.mia.papermc.get().pluginId)
id(libs.plugins.mia.nms.get().pluginId)
id(libs.plugins.mia.publication.get().pluginId)
alias(libs.plugins.kotlinx.serialization)
id(idofrontLibs.plugins.mia.kotlin.jvm.get().pluginId)
id(idofrontLibs.plugins.mia.papermc.get().pluginId)
id(idofrontLibs.plugins.mia.nms.get().pluginId)
id(idofrontLibs.plugins.mia.publication.get().pluginId)
alias(idofrontLibs.plugins.kotlinx.serialization)
}

dependencies {
api(gearyLibs.core)

// MineInAbyss platform
compileOnly(libs.kotlinx.serialization.json)
compileOnly(libs.kotlinx.serialization.kaml)
compileOnly(idofrontLibs.kotlinx.serialization.json)
compileOnly(idofrontLibs.kotlinx.serialization.kaml)
}
12 changes: 6 additions & 6 deletions geary-papermc-datastore/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
plugins {
id(libs.plugins.mia.kotlin.jvm.get().pluginId)
id(libs.plugins.mia.papermc.get().pluginId)
id(libs.plugins.mia.publication.get().pluginId)
alias(libs.plugins.kotlinx.serialization)
id(idofrontLibs.plugins.mia.kotlin.jvm.get().pluginId)
id(idofrontLibs.plugins.mia.papermc.get().pluginId)
id(idofrontLibs.plugins.mia.publication.get().pluginId)
alias(idofrontLibs.plugins.kotlinx.serialization)
}

dependencies {
implementation(project(":geary-papermc-core"))
api(gearyLibs.prefabs)
api(gearyLibs.serialization)

compileOnly(libs.kotlinx.serialization.json)
compileOnly(libs.kotlinx.serialization.cbor)
compileOnly(idofrontLibs.kotlinx.serialization.json)
compileOnly(idofrontLibs.kotlinx.serialization.cbor)
}
22 changes: 11 additions & 11 deletions geary-papermc-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
plugins {
id(libs.plugins.mia.copyjar.get().pluginId)
id(libs.plugins.mia.kotlin.jvm.get().pluginId)
id(libs.plugins.mia.papermc.get().pluginId)
id(libs.plugins.mia.nms.get().pluginId)
alias(libs.plugins.kotlinx.serialization)
id(idofrontLibs.plugins.mia.copyjar.get().pluginId)
id(idofrontLibs.plugins.mia.kotlin.jvm.get().pluginId)
id(idofrontLibs.plugins.mia.papermc.get().pluginId)
id(idofrontLibs.plugins.mia.nms.get().pluginId)
alias(idofrontLibs.plugins.kotlinx.serialization)
}

configurations {
Expand All @@ -19,14 +19,14 @@ dependencies {
implementation(project(":"))

// Plugins
compileOnly(myLibs.plugman)
compileOnly(libs.plugman)

// MineInAbyss platform
compileOnly(libs.kotlin.stdlib)
compileOnly(libs.kotlinx.serialization.json)
compileOnly(libs.kotlinx.serialization.kaml)
compileOnly(libs.kotlinx.coroutines)
compileOnly(libs.minecraft.mccoroutine)
compileOnly(idofrontLibs.kotlin.stdlib)
compileOnly(idofrontLibs.kotlinx.serialization.json)
compileOnly(idofrontLibs.kotlinx.serialization.kaml)
compileOnly(idofrontLibs.kotlinx.coroutines)
compileOnly(idofrontLibs.minecraft.mccoroutine)
}

copyJar {
Expand Down
16 changes: 8 additions & 8 deletions geary-papermc-tracking/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
plugins {
id(libs.plugins.mia.kotlin.jvm.get().pluginId)
id(libs.plugins.mia.papermc.get().pluginId)
id(libs.plugins.mia.nms.get().pluginId)
id(libs.plugins.mia.publication.get().pluginId)
alias(libs.plugins.kotlinx.serialization)
id(idofrontLibs.plugins.mia.kotlin.jvm.get().pluginId)
id(idofrontLibs.plugins.mia.papermc.get().pluginId)
id(idofrontLibs.plugins.mia.nms.get().pluginId)
id(idofrontLibs.plugins.mia.publication.get().pluginId)
alias(idofrontLibs.plugins.kotlinx.serialization)
}

dependencies {
compileOnly(libs.minecraft.plugin.mythic.dist)
compileOnly(libs.idofront.nms)
compileOnly(libs.minecraft.mccoroutine)
compileOnly(idofrontLibs.minecraft.plugin.mythic.dist)
compileOnly(idofrontLibs.idofront.nms)
compileOnly(idofrontLibs.minecraft.mccoroutine)
implementation(gearyLibs.uuid)
api(project(":geary-papermc-datastore"))
api(project(":geary-papermc-core"))
Expand Down
14 changes: 7 additions & 7 deletions geary-tests/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
plugins {
// id(libs.plugins.mia.copyjar.get().pluginId)
id(libs.plugins.mia.kotlin.jvm.get().pluginId)
// id(libs.plugins.mia.papermc.get().pluginId)
// id(libs.plugins.mia.nms.get().pluginId)
id(libs.plugins.mia.testing.get().pluginId)
alias(libs.plugins.kotlinx.serialization)
// id(idofrontLibs.plugins.mia.copyjar.get().pluginId)
id(idofrontLibs.plugins.mia.kotlin.jvm.get().pluginId)
// id(idofrontLibs.plugins.mia.papermc.get().pluginId)
// id(idofrontLibs.plugins.mia.nms.get().pluginId)
id(idofrontLibs.plugins.mia.testing.get().pluginId)
alias(idofrontLibs.plugins.kotlinx.serialization)
}

repositories {
Expand All @@ -14,5 +14,5 @@ repositories {
dependencies {
implementation(project(":"))

testImplementation(libs.minecraft.mockbukkit)
testImplementation(idofrontLibs.minecraft.mockbukkit)
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kotlin.code.style=official
group=com.mineinabyss
version=0.29
idofrontVersion=0.21.6
gearyVersion=0.25.2
idofrontVersion=0.22.0
gearyVersion=0.25.3
File renamed without changes.
3 changes: 1 addition & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ dependencyResolutionManagement {
}

versionCatalogs {
create("libs") {
create("idofrontLibs") {
from("com.mineinabyss:catalog:$idofrontVersion")
}
create("myLibs").from(files("gradle/myLibs.versions.toml"))
create("gearyLibs").from("com.mineinabyss:geary-catalog:$gearyVersion")
}
}
Expand Down

0 comments on commit bed6e37

Please sign in to comment.