Merge pull request #34 from SLNE-Development/fix/repo

Fix/repo

Author: twisti-dev

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

@@ -14,7 +14,7 @@ plugins {
 }
 
 group = groupId
-version = "$mcVersion-1.0.95"
+version = "$mcVersion-1.0.96"
 
 repositories {
     mavenCentral()
@@ -71,8 +71,12 @@ gradlePlugin {
             maven("https://repo.slne.dev/repository/maven-releases/") {
                 name = "maven-releases"
                 credentials {
-                    username = System.getenv("MAVEN_RELEASES_USERNAME")
-                    password = System.getenv("MAVEN_RELEASES_PASSWORD")
+                    val getenv = System.getenv("SLNE_RELEASES_REPO_USERNAME")
+
+                    System.err.println("Username: $getenv")
+
+                    username = getenv
+                    password = System.getenv("SLNE_RELEASES_REPO_PASSWORD")
                 }
             }
         }

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

@@ -4,6 +4,7 @@ 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.slnePublic
+import dev.slne.surf.surfapi.gradle.util.slneSnapshots
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.model.ObjectFactory
@@ -97,6 +98,7 @@ abstract class CommonSurfPlugin<E : CommonSurfExtension>(
             gradlePluginPortal()
 
             slnePublic()
+            slneSnapshots()
         }
 
         applyRepositories0()

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

@@ -1,7 +1,54 @@
 package dev.slne.surf.surfapi.gradle.util
 
 import org.gradle.api.artifacts.dsl.RepositoryHandler
+import org.gradle.api.artifacts.repositories.MavenArtifactRepository
 import org.gradle.kotlin.dsl.maven
 
-fun RepositoryHandler.slnePublic() = maven("https://repo.slne.dev/repository/maven-public/") { name = "maven-public" }
-fun RepositoryHandler.slnePrivate() = maven("https://repo.slne.dev/repository/maven-private/") { name = "maven-private" }
+const val DEFAULT_USERNAME_ENV_PRIVATE = "SLNE_PRIVATE_REPO_USERNAME"
+const val DEFAULT_PASSWORD_ENV_PRIVATE = "SLNE_PRIVATE_REPO_PASSWORD"
+
+const val DEFAULT_USERNAME_SNAPSHOTS = "SLNE_SNAPSHOTS_REPO_USERNAME"
+const val DEFAULT_PASSWORD_SNAPSHOTS = "SLNE_SNAPSHOTS_REPO_PASSWORD"
+
+const val DEFAULT_USERNAME_RELEASES = "SLNE_RELEASES_REPO_USERNAME"
+const val DEFAULT_PASSWORD_RELEASES = "SLNE_RELEASES_REPO_PASSWORD"
+
+inline fun RepositoryHandler.slnePublic(crossinline block: MavenArtifactRepository.() -> Unit = {}) =
+    maven("https://repo.slne.dev/repository/maven-public/") {
+        name = "maven-public"
+        block()
+    }
+
+inline fun RepositoryHandler.slneSnapshots(crossinline block: MavenArtifactRepository.() -> Unit = {}) =
+    maven("https://repo.slne.dev/repository/maven-snapshots/") {
+        name = "maven-snapshots"
+        credentials {
+            username = System.getenv(DEFAULT_USERNAME_SNAPSHOTS)
+            password = System.getenv(DEFAULT_PASSWORD_SNAPSHOTS)
+        }
+
+        block()
+    }
+
+
+inline fun RepositoryHandler.slneReleases(crossinline block: MavenArtifactRepository.() -> Unit = {}) =
+    maven("https://repo.slne.dev/repository/maven-releases/") {
+        name = "maven-releases"
+        credentials {
+            username = System.getenv(DEFAULT_USERNAME_RELEASES)
+            password = System.getenv(DEFAULT_PASSWORD_RELEASES)
+        }
+
+        block()
+    }
+
+
+inline fun RepositoryHandler.slnePrivate(crossinline block: MavenArtifactRepository.() -> Unit = {}) =
+    maven("https://repo.slne.dev/repository/maven-private/") {
+        name = "maven-private"
+        credentials {
+            username = System.getenv(DEFAULT_USERNAME_ENV_PRIVATE)
+            password = System.getenv(DEFAULT_PASSWORD_ENV_PRIVATE)
+        }
+        block()
+    }