Add the option to publish to a different LDTTeam repo, also move arou…

…nd the modding registration.
ldtteam · Jan 7, 2025 · 29dd214 · 29dd214
1 parent 1d77ad5
commit 29dd214
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/modules/common/src/main/java/com/ldtteam/tableau/common/CommonProjectPlugin.java b/modules/common/src/main/java/com/ldtteam/tableau/common/CommonProjectPlugin.java
@@ -76,10 +76,6 @@ public void apply(@NotNull Project target) {
      * @param target The target project.
      */
     private void configureRepositories(@NotNull Project target) {
-        target.getRepositories().maven(maven -> {
-            maven.setUrl("https://ldtteam.jfrog.io/ldtteam/modding/");
-            maven.setName("LDT Team Modding");
-        });
         target.getRepositories().mavenLocal();
         target.getRepositories().mavenCentral();
         target.getRepositories().flatDir(dir -> {

diff --git a/...blishing/src/main/java/com/ldtteam/tableau/maven/publishing/MavenPublishingExtension.java b/...blishing/src/main/java/com/ldtteam/tableau/maven/publishing/MavenPublishingExtension.java
@@ -74,11 +74,22 @@ public void pom(Action<? super POM> configure) {
     }
 
     /**
-     * Configures the publishing system to publish the project to the LDTTeam Maven repository.
+     * Configures the publishing system to publish the project to the LDTTeam Mod Maven repository.
      * <p>
      *     Also configures the POM to publish to the LDTTeam Maven repository.
      */
-    public void publishToLDTTeam() {
+    public void publishAsLDTTeamMod() {
+        publishToLDTTeamMaven("mods-maven");
+    }
+
+    /**
+     * Configures the publishing system to publish the project to the LDTTeam repository.
+     * <p>
+     *     Also configures the POM to publish to the LDTTeam Maven repository.
+     *
+     * @param repositoryId The Artifactory repository id to publish to.
+     */
+    public void publishToLDTTeamMaven(final String repositoryId) {
         //LDTTeam always overrides configured POM settings
         pom(POM::distributeOnLDTTeamMaven);
 
@@ -92,7 +103,7 @@ public void publishToLDTTeam() {
         if (username.isPresent() && password.isPresent()) {
             publishing.repositories(mavenRepositories -> {
                 mavenRepositories.maven(mavenRepository -> {
-                    mavenRepository.setUrl("https://ldtteam.jfrog.io/ldtteam/mods-maven");
+                    mavenRepository.setUrl("https://ldtteam.jfrog.io/ldtteam/%s".formatted(repositoryId));
                     mavenRepository.credentials(credentials -> {
                         credentials.setUsername(username.get());
                         credentials.setPassword(password.get());

diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java
@@ -58,6 +58,11 @@ public void apply(@NotNull Project target) {
 
         TableauScriptingExtension.register(target, NeoGradleExtension.EXTENSION_NAME, NeoGradleExtension.class, target);
 
+        target.getRepositories().maven(maven -> {
+            maven.setUrl("https://ldtteam.jfrog.io/ldtteam/modding/");
+            maven.setName("LDT Team Modding");
+        });
+
         configureLibraryConfigurations(target);
         configureSourceSets(target);
         configureRuns(target);