Merge pull request #30 from SLNE-Development/patch/version/1.21

patch/version/1.21

Author: ammodev

.github/workflows/publish.yml

@@ -25,7 +25,7 @@ jobs:
         with:
           distribution: 'graalvm'
           java-version: '21'
-      - name: Build with Gradle
-        run: ./gradlew shadowJar
-      - name: Publish to Maven
-        run: ./gradlew publish
+#      - name: Build with Gradle
+#        run: ./gradlew shadowJar
+#      - name: Publish to Maven
+#        run: ./gradlew publish

surf-api-gradle-plugin/build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 }
 
 group = groupId
-version = "$mcVersion-1.0.93"
+version = "$mcVersion-1.0.94"
 
 repositories {
     mavenCentral()

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/common/CommonSurfPlugin.kt

@@ -3,7 +3,7 @@ package dev.slne.surf.surfapi.gradle.platform.common
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import dev.slne.surf.surfapi.gradle.generated.Constants
 import dev.slne.surf.surfapi.gradle.platform.SurfApiPlatform
-import dev.slne.surf.surfapi.gradle.util.*
+import dev.slne.surf.surfapi.gradle.util.slnePublic
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.model.ObjectFactory
@@ -96,11 +96,7 @@ abstract class CommonSurfPlugin<E : CommonSurfExtension>(
             mavenCentral()
             gradlePluginPortal()
 
-            slneUnsafe()
             slnePublic()
-            slneSnapshots()
-            slneProxy()
-            slneExternalDevelopers()
         }
 
         applyRepositories0()
@@ -114,7 +110,6 @@ abstract class CommonSurfPlugin<E : CommonSurfExtension>(
             relocations.forEach { (from, to) ->
                 relocate(from, "${Constants.RELOCATION_PREFIX}.$to")
             }
-
         }
 
         gradle.projectsEvaluated {
@@ -129,7 +124,6 @@ abstract class CommonSurfPlugin<E : CommonSurfExtension>(
 
                 println("contains surf-cloud-api-common: ${deps.any { it.contains("surf-cloud-api-common") }}")
 
-
                 dependencyDependentRelocations.forEach { (dependency, relocations) ->
                     if (deps.any { it.contains(dependency) }) {
                         logger.warn("Dependency $dependency found. Applying relocations.")
@@ -142,7 +136,6 @@ abstract class CommonSurfPlugin<E : CommonSurfExtension>(
             }
         }
 
-
         tasks.withType<JavaCompile> {
             options.encoding = Charsets.UTF_8.name()
             options.compilerArgs.addAll(listOf("-parameters"))
@@ -195,7 +188,6 @@ abstract class CommonSurfPlugin<E : CommonSurfExtension>(
         }
     }
 
-
     protected open fun Project.afterEvaluated0(extension: E) {
     }
 }

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/core/CoreSurfExtension.kt

@@ -7,5 +7,5 @@ import javax.inject.Inject
 
 open class CoreSurfExtension @Inject constructor(objects: ObjectFactory) :
     CommonSurfExtension(objects) {
-    val authors = objects.listProperty<String>().convention(mutableListOf("SLNE Development Team"))
+    val authors = objects.listProperty<String>().convention(mutableListOf("SLNE Development"))
 }

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/util/repo-extensions.kt

@@ -3,8 +3,5 @@ package dev.slne.surf.surfapi.gradle.util
 import org.gradle.api.artifacts.dsl.RepositoryHandler
 import org.gradle.kotlin.dsl.maven
 
-fun RepositoryHandler.slneUnsafe() = maven("https://repo.slne.dev/repository/maven-unsafe/") { name = "maven-unsafe" }
 fun RepositoryHandler.slnePublic() = maven("https://repo.slne.dev/repository/maven-public/") { name = "maven-public" }
-fun RepositoryHandler.slneSnapshots() = maven("https://repo.slne.dev/repository/maven-snapshots/") { name = "maven-snapshots" }
-fun RepositoryHandler.slneProxy() = maven("https://repo.slne.dev/repository/maven-proxy/") { name = "maven-proxy" }
-fun RepositoryHandler.slneExternalDevelopers() = maven("https://repo.slne.dev/repository/maven-external-developers/") { name = "maven-external-developers" }
+fun RepositoryHandler.slnePrivate() = maven("https://repo.slne.dev/repository/maven-private/") { name = "maven-private" }