Merge pull request #26

twisti-dev · web-flow · commit 9329ffafa4c5 · 2025-02-14T21:56:46.000+01:00
ci/add-publish-yml
diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
@@ -1,9 +1,9 @@
 name: Publish Dokka Docs
 
 on:
-  push:
-    branches:
-      - version/1.21
+#  push:
+#    branches:
+#      - version/1.21
   workflow_dispatch:
 
 permissions:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,29 @@
+name: Publish to Maven
+
+on:
+  push:
+    branches:
+      - version/1.21
+
+env:
+  MAVEN_URL: ${{ secrets.REPO_PUBLISH_URL }}
+  MAVEN_USERNAME: ${{ secrets.REPO_PUBLISH_USERNAME }}
+  MAVEN_PASSWORD: ${{ secrets.REPO_PUBLISH_TOKEN }}
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Setup JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'graalvm'
+          java-version: '21'
+      - name: Build with Gradle
+        run: ./gradlew shadowJar
+      - name: Publish to Maven
+        run: ./gradlew publish
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,8 +1,6 @@
-import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
-
 plugins {
     id("io.papermc.paperweight.userdev") version "2.0.0-beta.14" apply false
-    alias(libs.plugins.dokka)
+//    alias(libs.plugins.dokka)
 }
 
 allprojects {
@@ -15,14 +13,14 @@ allprojects {
 //    }
 }
 
-dependencies {
-    dokka(project(":surf-api-core:surf-api-core-api"))
-    dokka(project(":surf-api-bukkit:surf-api-bukkit-api"))
-    dokka(project(":surf-api-velocity:surf-api-velocity-api"))
-}
-
-dokka {
-    dokkaSourceSets.configureEach {
-        documentedVisibilities = setOf(VisibilityModifier.Public, VisibilityModifier.Protected)
-    }
-}
+//dependencies {
+//    dokka(project(":surf-api-core:surf-api-core-api"))
+//    dokka(project(":surf-api-bukkit:surf-api-bukkit-api"))
+//    dokka(project(":surf-api-velocity:surf-api-velocity-api"))
+//}
+//
+//dokka {
+//    dokkaSourceSets.configureEach {
+//        documentedVisibilities = setOf(VisibilityModifier.Public, VisibilityModifier.Protected)
+//    }
+//}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -39,7 +39,7 @@ gson = "2.11.0"
 commons-lang3 = "3.17.0"
 commons-text = "1.13.0"
 commons-math4-core = "4.0-beta1"
-plugin-yml-paper = "0.6.0"
+plugin-yml-paper = "0.7.0"
 spongepowered-math = "2.0.1"
 fastutil = "8.5.15"
 okhttp = "5.0.0-alpha.14"
@@ -147,12 +147,12 @@ kotlin-serialization = { module = "org.jetbrains.kotlin.plugin.serialization:org
 maven-repo-auth = { module = "org.hibernate.build.maven-repo-auth:org.hibernate.build.maven-repo-auth.gradle.plugin", version.ref = "maven-repo-auth" }
 shadow-gradle-plugin = { module = "com.gradleup.shadow:shadow-gradle-plugin", version.ref = "shadow-gradle-plugin" }
 ksp-gradle-plugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp-gradle-plugin" }
-plugin-yml-paper-gradle-plugin = { module = "net.minecrell.plugin-yml.bukkit:net.minecrell.plugin-yml.bukkit.gradle.plugin", version.ref = "plugin-yml-paper" }
+plugin-yml-paper-gradle-plugin = { module = "de.eldoria.plugin-yml.paper:de.eldoria.plugin-yml.paper.gradle.plugin", version.ref = "plugin-yml-paper" }
 run-paper-gradle-plugin = { module = "xyz.jpenilla.run-paper:xyz.jpenilla.run-paper.gradle.plugin", version.ref = "run-paper-gradle-plugin" }
 dokka-gradle-plugin = { module = "org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin", version.ref = "dokka" }
 
 [plugins]
-plugin-yml-paper = { id = "net.minecrell.plugin-yml.paper", version.ref = "plugin-yml-paper" }
+plugin-yml-paper = { id = "de.eldoria.plugin-yml.paper", version.ref = "plugin-yml-paper" }
 run-paper = { id = "xyz.jpenilla.run-paper", version.ref = "run-paper-gradle-plugin" }
 maven-repo-auth = { id = "org.hibernate.build.maven-repo-auth", version.ref = "maven-repo-auth" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -21,10 +21,10 @@ include(":surf-api-velocity:surf-api-velocity-api")
 include(":surf-api-velocity:surf-api-velocity-server")
 
 include("surf-api-standalone")
+include("surf-api-gradle-plugin")
 
 if (!ci) {
     include(":surf-api-bukkit:surf-api-bukkit-plugin-test")
 //    include("surf-api-generator")
     include("surf-api-modern-generator")
-    include("surf-api-gradle-plugin")
 }
diff --git a/surf-api-bukkit/surf-api-bukkit-api/build.gradle.kts b/surf-api-bukkit/surf-api-bukkit-api/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     `core-convention`
-    alias(libs.plugins.dokka)
+//    alias(libs.plugins.dokka)
 }
 
 dependencies {
diff --git a/surf-api-core/surf-api-core-api/build.gradle.kts b/surf-api-core/surf-api-core-api/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     `core-convention`
-    alias(libs.plugins.dokka)
+//    alias(libs.plugins.dokka)
 }
 
 dependencies {
diff --git a/surf-api-velocity/surf-api-velocity-api/build.gradle.kts b/surf-api-velocity/surf-api-velocity-api/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     `core-convention`
-    alias(libs.plugins.dokka)
+//    alias(libs.plugins.dokka)
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`core-convention`
`3`		`- alias(libs.plugins.dokka)`
	`3`	`+// alias(libs.plugins.dokka)`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`dependencies {`