Skip to content

Commit 4a49efa

Browse files
committed
Update to latest compose an idofront version
1 parent 13812c4 commit 4a49efa

File tree

9 files changed

+34
-34
lines changed

9 files changed

+34
-34
lines changed

.github/workflows/gradle-ci.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,22 @@ on:
88
- '**.md'
99
pull_request:
1010

11+
concurrency:
12+
cancel-in-progress: true
13+
group: ci-${{ github.ref }}
14+
1115
jobs:
1216
build:
1317
runs-on: ubuntu-latest
1418
steps:
15-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
1620

1721
- name: Set up JDK
18-
uses: actions/setup-java@v2
22+
uses: actions/setup-java@v3
1923
with:
2024
distribution: temurin
2125
java-version: 17
2226
cache: gradle
2327

2428
- name: Build
2529
run: gradle build
26-
27-
- name: Upload build
28-
uses: actions/upload-artifact@v1
29-
with:
30-
name: build
31-
path: build/libs

.github/workflows/publish-packages.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,26 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616

1717
- name: Set up JDK
18-
uses: actions/setup-java@v2
18+
uses: actions/setup-java@v3
1919
with:
2020
distribution: temurin
2121
java-version: 17
2222
cache: gradle
2323

24-
- name: Run gradle build and publish
25-
run: gradle build publish -PmineinabyssMavenUsername=${{ secrets.MAVEN_PUBLISH_USERNAME }} -PmineinabyssMavenPassword=${{ secrets.MAVEN_PUBLISH_PASSWORD }}
24+
- name: Set env variable from latest maven version
25+
run: >
26+
echo "RELEASE_VERSION=$( \
27+
curl https://repo.mineinabyss.com/releases/com/mineinabyss/guiy-compose/maven-metadata.xml | \
28+
grep -oP '(?!<latest>)[\d\.]*(?=</latest>)' \
29+
)" >> $GITHUB_ENV
2630
27-
# - name: Generate Dokka
28-
# run: gradle dokkaHtmlMultiModule
31+
- name: Run gradle build and publish
32+
run: >
33+
gradle build publish
34+
-PmineinabyssMavenUsername=${{ secrets.MAVEN_PUBLISH_USERNAME }} -PmineinabyssMavenPassword=${{ secrets.MAVEN_PUBLISH_PASSWORD }}
2935
3036
# - name: Publish documentation to GitHub Pages
3137
# uses: peaceiris/actions-gh-pages@v3

build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ plugins {
77
id("com.mineinabyss.conventions.kotlin")
88
id("com.mineinabyss.conventions.papermc")
99
id("com.mineinabyss.conventions.nms")
10+
id("com.mineinabyss.conventions.autoversion")
1011
id("com.mineinabyss.conventions.publication")
1112
id("com.mineinabyss.conventions.testing")
1213
id("com.mineinabyss.conventions.copyjar")
@@ -43,6 +44,6 @@ dependencies {
4344
exclude("org.jetbrains.kotlinx")
4445
}
4546

46-
implementation(libs.idofront.core)
47+
implementation(libs.bundles.idofront.core)
4748
implementation(libs.idofront.nms)
4849
}

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
kotlin.code.style=official
22
group=com.mineinabyss
3-
version=0.7
4-
kotlinVersion=1.6.10
5-
composeVersion=1.1.1
3+
version=0.8
4+
kotlinVersion=1.7.10
5+
composeVersion=1.2.0
66
serverVersion=1.19.2-R0.1-SNAPSHOT
7-
idofrontVersion=0.12.112
7+
idofrontVersion=0.14.7

guiy-example/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ dependencies {
1111
// MineInAbyss platform
1212
compileOnly(project(":"))
1313
compileOnly(libs.kotlinx.coroutines)
14-
implementation("com.mineinabyss:idofront:$idofrontVersion")
14+
implementation("com.mineinabyss:idofront-commands:$idofrontVersion")
15+
implementation("com.mineinabyss:idofront-platform-loader:$idofrontVersion")
1516
}
1617

1718
tasks {

guiy-example/src/main/kotlin/com/mineinabyss/guiy/example/GuiyCommands.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ package com.mineinabyss.guiy.example
22

33
import com.mineinabyss.guiy.example.gui.MainMenu
44
import com.mineinabyss.guiy.inventory.guiy
5-
import com.mineinabyss.idofront.commands.CommandHolder
65
import com.mineinabyss.idofront.commands.execution.IdofrontCommandExecutor
76
import com.mineinabyss.idofront.commands.extensions.actions.playerAction
87

9-
class GuiyCommands(val plugin: GuiyExamplePlugin): IdofrontCommandExecutor() {
8+
class GuiyCommands(val plugin: GuiyExamplePlugin) : IdofrontCommandExecutor() {
109
override val commands = commands(plugin) {
1110
"guiyexample" {
1211
playerAction {

guiy-example/src/main/kotlin/com/mineinabyss/guiy/example/GuiyExamplePlugin.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.mineinabyss.guiy.example
22

3-
import com.mineinabyss.idofront.platforms.IdofrontPlatforms
3+
import com.mineinabyss.idofront.platforms.Platforms
44
import org.bukkit.plugin.java.JavaPlugin
55

66
class GuiyExamplePlugin : JavaPlugin() {
77
override fun onLoad() {
8-
IdofrontPlatforms.load(this, "mineinabyss")
8+
Platforms.load(this, "mineinabyss")
99
}
1010

1111
override fun onEnable() {

src/main/kotlin/com/mineinabyss/guiy/GuiyPlugin.kt

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,21 @@ package com.mineinabyss.guiy
33
import com.mineinabyss.guiy.inventory.GuiyEventListener
44
import com.mineinabyss.guiy.inventory.GuiyInventoryHolder
55
import com.mineinabyss.guiy.inventory.GuiyScopeManager
6-
import com.mineinabyss.idofront.nms.aliases.NMSItemStack
7-
import com.mineinabyss.idofront.nms.aliases.toNMS
8-
import com.mineinabyss.idofront.platforms.IdofrontPlatforms
9-
import com.mineinabyss.idofront.plugin.registerEvents
6+
import com.mineinabyss.idofront.platforms.Platforms
7+
import com.mineinabyss.idofront.plugin.listeners
108
import kotlinx.coroutines.cancel
11-
import net.minecraft.world.item.Items
129
import org.bukkit.Bukkit
13-
import org.bukkit.Material
14-
import org.bukkit.inventory.ItemStack
1510
import org.bukkit.plugin.java.JavaPlugin
1611

1712
val guiyPlugin = Bukkit.getPluginManager().getPlugin("Guiy") as JavaPlugin
1813

1914
class GuiyPlugin : JavaPlugin() {
2015
override fun onLoad() {
21-
IdofrontPlatforms.load(this, "mineinabyss")
16+
Platforms.load(this, "mineinabyss")
2217
}
2318

2419
override fun onEnable() {
25-
registerEvents(GuiyEventListener())
20+
listeners(GuiyEventListener())
2621
}
2722

2823
override fun onDisable() {

src/main/kotlin/com/mineinabyss/guiy/components/canvases/Chest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import com.mineinabyss.guiy.modifiers.SizeModifier
1313
import com.mineinabyss.guiy.modifiers.sizeIn
1414
import com.mineinabyss.guiy.nodes.InventoryCloseScope
1515
import com.mineinabyss.guiy.nodes.StaticMeasurePolicy
16-
import com.mineinabyss.idofront.messaging.miniMsg
16+
import com.mineinabyss.idofront.textcomponents.miniMsg
1717
import net.kyori.adventure.text.Component
1818
import org.bukkit.Bukkit
1919
import org.bukkit.entity.Player

0 commit comments

Comments
 (0)