Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .github/workflows/release-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@ name: Create Release

on:
workflow_dispatch:
inputs:
branch:
description: 'Branch to build and publish'
required: true
default: 'develop'
type: choice
options:
- develop
- feat/platform

jobs:
build:
Expand All @@ -12,7 +21,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3
with:
ref: develop # Ensure it works from the develop branch
ref: ${{ inputs.branch }}

- name: Set up JDK 21
uses: actions/setup-java@v3
Expand Down Expand Up @@ -56,7 +65,7 @@ jobs:
release_name: v${{ env.GRADLE_VERSION }}-dev.${{ env.COMMIT_HASH }}
draft: false
prerelease: true
commitish: develop
commitish: ${{ inputs.branch }}
body: |
This release contains dev builds for all Gradle modules.
env:
Expand Down
10 changes: 10 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
val baseVersion = "0.0.1"
val commitHash = System.getenv("COMMIT_HASH")
val timestamp = System.currentTimeMillis() // Temporary to be able to build and publish directly out of fix branch with same commit hash
val snapshotVersion = "${baseVersion}-dev.${timestamp}-${commitHash}"
val snapshotVersion = "${baseVersion}-platform.${timestamp}-${commitHash}"

allprojects {
group = "app.simplecloud.plugin"
Expand All @@ -19,7 +19,6 @@ allprojects {
maven("https://libraries.minecraft.net")
maven("https://buf.build/gen/maven")
maven("https://repo.simplecloud.app/snapshots")
maven("https://buf.build/gen/maven")
maven("https://repo.papermc.io/repository/maven-public")
}
}
Expand All @@ -31,8 +30,11 @@ subprojects {
dependencies {
testImplementation(rootProject.libs.kotlin.test)
compileOnly(rootProject.libs.kotlin.jvm)
compileOnly(rootProject.libs.bundles.simpleCloudController)
compileOnly(rootProject.libs.kotlin.coroutines)
compileOnly(rootProject.libs.simplecloud.api)
compileOnly(rootProject.libs.bundles.adventure)
compileOnly(rootProject.libs.bundles.configurate)
compileOnly(rootProject.libs.slf4j.api)
}

kotlin {
Expand Down
34 changes: 25 additions & 9 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,22 +1,38 @@
[versions]
kotlin = "2.0.20"
simpleCloudController = "0.0.30-dev.e3e27fc"
sonatype-central-portal-publisher = "1.2.3"
adventure = "4.18.0"
kotlin = "2.2.20"
kotlin-coroutines = "1.10.2"

sonatype-central-portal-publisher = "1.2.4"

simplecloud-api = "0.1.0-platform.23-dev.1775473227066-1c0c25a"

velocity = "3.5.0-SNAPSHOT"
adventure = "4.26.1"

configurate = "4.2.0"
slf4j = "2.0.17"

[libraries]
kotlin-jvm = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" }

simpleCloudControllerApi = { module = "app.simplecloud.controller:controller-api", version.ref = "simpleCloudController" }
simpleCloudControllerShared = { module = "app.simplecloud.controller:controller-shared", version.ref = "simpleCloudController" }
simplecloud-api = { module = "app.simplecloud.api:api", version.ref = "simplecloud-api" }

velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "velocity" }

adventure = { module = "net.kyori:adventure-api", version.ref = "adventure" }
adventureMiniMessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "adventure" }
adventure-minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "adventure" }

configurate-yaml = { module = "org.spongepowered:configurate-yaml", version.ref = "configurate" }
configurate-gson = { module = "org.spongepowered:configurate-gson", version.ref = "configurate" }
configurate-extra-kotlin = { module = "org.spongepowered:configurate-extra-kotlin", version.ref = "configurate" }

slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }

[bundles]
simpleCloudController = ["simpleCloudControllerApi", "simpleCloudControllerShared"]
adventure = ["adventure", "adventureMiniMessage"]
adventure = ["adventure", "adventure-minimessage"]
configurate = ["configurate-yaml", "configurate-gson", "configurate-extra-kotlin"]

[plugins]
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
Expand Down
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Sun Dec 29 18:17:48 CET 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading