Merge remote-tracking branch 'origin/dev/1.6' into dev/1.6

babric · Apr 4, 2024 · 16383cf · 16383cf
2 parents 524aedf + 182973b
commit 16383cf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -65,8 +65,8 @@ java {
 
 gradlePlugin {
  plugins {
- babricLoom {
- id = 'babric-loom'
+ babricLoomExtension {
+ id = 'babric-loom-extension'
  implementationClass = 'babric.BabricLoomPlugin'
  }
  }
@@ -89,8 +89,8 @@ publishing {
 
  // Manually crate the plugin marker for snapshot versions
  snapshotPlugin(MavenPublication) { publication ->
- groupId 'babric-loom'
- artifactId 'babric-loom.gradle.plugin'
+ groupId 'babric-loom-extension'
+ artifactId 'babric-loom-extension.gradle.plugin'
  version baseVersion + '-SNAPSHOT'
 
  pom.withXml({
@@ -102,7 +102,7 @@ publishing {
  Node groupId = dependency.appendChild(document.createElement('groupId'))
  groupId.setTextContent('babric')
  Node artifactId = dependency.appendChild(document.createElement('artifactId'))
- artifactId.setTextContent('babric-loom')
+ artifactId.setTextContent('babric-loom-extension')
  Node version = dependency.appendChild(document.createElement('version'))
  version.setTextContent(baseVersion + '-SNAPSHOT')
  })
@@ -119,4 +119,4 @@ publishing {
  }
  }
  }
-}
+}
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,2 @@
-rootProject.name = "babric-loom"
+rootProject.name = "babric-loom-extension"
 
diff --git a/test-mod/build.gradle b/test-mod/build.gradle
@@ -1,7 +1,7 @@
 plugins {
  id 'fabric-loom' version "1.6-SNAPSHOT"
  id 'maven-publish'
- id 'babric-loom'
+ id 'babric-loom-extension'
 }
 
 version = project.mod_version
@@ -79,4 +79,4 @@ publishing {
  // The repositories here will be used for publishing your artifact, not for
  // retrieving dependencies.
  }
-}
+}