test new publish

Astra-Interactive · Nov 29, 2024 · e057aa1 · e057aa1
1 parent 4a10c94
commit e057aa1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 26 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -14,11 +14,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ gradle_validation ]
     env:
-      makeevrserg_SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
-      makeevrserg_SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
-      makeevrserg_OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-      makeevrserg_OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-      makeevrserg_SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+      ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }}
+      ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }}
+      ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }}
+      ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYID }}
+      ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYPASSWORD }}
 
     steps:
       - uses: actions/checkout@v4

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,20 +8,15 @@ plugins {
     alias(libs.plugins.klibs.gradle.dokka.root) apply false
     alias(libs.plugins.klibs.gradle.dokka.module) apply false
     alias(libs.plugins.klibs.gradle.java.core) apply false
-    alias(libs.plugins.klibs.gradle.stub.javadoc) apply false
     alias(libs.plugins.klibs.gradle.publication) apply false
     alias(libs.plugins.klibs.gradle.rootinfo) apply false
-    // klibs - minecraft
-    alias(libs.plugins.klibs.gradle.minecraft.empty) apply false
-    alias(libs.plugins.klibs.gradle.minecraft.multiplatform) apply false
 }
 
-apply(plugin = "ru.astrainteractive.gradleplugin.dokka.root")
 apply(plugin = "ru.astrainteractive.gradleplugin.detekt")
 apply(plugin = "ru.astrainteractive.gradleplugin.root.info")
 
 subprojects.forEach {
-    it.apply(plugin = "ru.astrainteractive.gradleplugin.dokka.module")
+    it.apply(plugin = "ru.astrainteractive.gradleplugin.root.info")
     if (it.name != "bukkit" && it.name != "benchmarks") {
         it.apply(plugin = "ru.astrainteractive.gradleplugin.publication")
     }

diff --git a/gradle.properties b/gradle.properties
@@ -1,18 +1,15 @@
 # Gradle
 org.gradle.parallel=true
-org.gradle.configuration-cache=true
-org.gradle.caching=true
 org.gradle.jvmargs=-Xmx3G -XX:+UseParallelGC
 kotlin.code.style=official
-testTask.ignoreFailures=true
 # Java
 makeevrserg.java.source=8
 makeevrserg.java.target=21
 makeevrserg.java.ktarget=21
 # Project
 makeevrserg.project.name=AstraLibs
 makeevrserg.project.group=ru.astrainteractive.astralibs
-makeevrserg.project.version.string=3.16.1
+makeevrserg.project.version.string=3.16.2
 makeevrserg.project.description=Core utilities for spigot development
 makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
 makeevrserg.project.url=https://empireprojekt.ru

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -29,7 +29,7 @@ tests-junit-bom = "5.11.3"
 kyori = "4.17.0" # https://github.com/KyoriPowered/adventure-platform
 
 # klibs
-klibs-gradleplugin = "1.3.4" # https://github.com/makeevrserg/gradle-plugin
+klibs-gradleplugin = "1.5.0-alpha02" # https://github.com/makeevrserg/gradle-plugin
 klibs-kstorage = "3.2.0" # https://github.com/makeevrserg/klibs.kstorage
 klibs-mikro = "1.8.8" # https://github.com/makeevrserg/klibs.mikro
 
@@ -107,15 +107,5 @@ klibs-gradle-detekt-compose = { id = "ru.astrainteractive.gradleplugin.detekt.co
 klibs-gradle-dokka-root = { id = "ru.astrainteractive.gradleplugin.dokka.root", version.ref = "klibs-gradleplugin" }
 klibs-gradle-dokka-module = { id = "ru.astrainteractive.gradleplugin.dokka.module", version.ref = "klibs-gradleplugin" }
 klibs-gradle-java-core = { id = "ru.astrainteractive.gradleplugin.java.core", version.ref = "klibs-gradleplugin" }
-klibs-gradle-stub-javadoc = { id = "ru.astrainteractive.gradleplugin.stub.javadoc", version.ref = "klibs-gradleplugin" }
 klibs-gradle-publication = { id = "ru.astrainteractive.gradleplugin.publication", version.ref = "klibs-gradleplugin" }
 klibs-gradle-rootinfo = { id = "ru.astrainteractive.gradleplugin.root.info", version.ref = "klibs-gradleplugin" }
-# klibs - android
-klibs-gradle-android-core = { id = "ru.astrainteractive.gradleplugin.android.core", version.ref = "klibs-gradleplugin" }
-klibs-gradle-android-compose = { id = "ru.astrainteractive.gradleplugin.android.compose", version.ref = "klibs-gradleplugin" }
-klibs-gradle-android-apk-sign = { id = "ru.astrainteractive.gradleplugin.android.apk.sign", version.ref = "klibs-gradleplugin" }
-klibs-gradle-android-apk-name = { id = "ru.astrainteractive.gradleplugin.android.apk.name", version.ref = "klibs-gradleplugin" }
-klibs-gradle-android-publication = { id = "ru.astrainteractive.gradleplugin.android.publication", version.ref = "klibs-gradleplugin" }
-# klibs - minecraft
-klibs-gradle-minecraft-empty = { id = "ru.astrainteractive.gradleplugin.minecraft.empty", version.ref = "klibs-gradleplugin" }
-klibs-gradle-minecraft-multiplatform = { id = "ru.astrainteractive.gradleplugin.minecraft.multiplatform", version.ref = "klibs-gradleplugin" }