From 4efac2b3b95ac663aa551d02d72898a58b41e80a Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Sat, 29 Apr 2023 22:49:35 +0300
Subject: [PATCH] Forge tests: Fix convention usage

---
 .../projects/forge/accessTransformer/build.gradle     | 11 ++++++++---
 src/test/resources/projects/forge/aw2At/build.gradle  | 11 ++++++++---
 .../projects/forge/externalModDependency/build.gradle | 11 ++++++++---
 .../projects/forge/legacyAw2AtMojmap/build.gradle     | 11 ++++++++---
 .../projects/forge/legacyAw2AtYarn/build.gradle       | 11 ++++++++---
 .../projects/forge/loggerConfig/build.gradle          |  5 ++++-
 src/test/resources/projects/forge/simple/build.gradle | 11 ++++++++---
 .../projects/forge/simpleMixinAp/build.gradle         | 11 ++++++++---
 8 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/src/test/resources/projects/forge/accessTransformer/build.gradle b/src/test/resources/projects/forge/accessTransformer/build.gradle
index 4b8ee2de..cecc62d2 100644
--- a/src/test/resources/projects/forge/accessTransformer/build.gradle
+++ b/src/test/resources/projects/forge/accessTransformer/build.gradle
@@ -3,10 +3,15 @@ plugins {
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+java {
+	sourceCompatibility = JavaVersion.VERSION_17
+	targetCompatibility = JavaVersion.VERSION_17
+}
+
+base {
+	archivesName = project.archives_base_name
+}
 
-archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
diff --git a/src/test/resources/projects/forge/aw2At/build.gradle b/src/test/resources/projects/forge/aw2At/build.gradle
index 81ff4b9b..7ed9dca7 100644
--- a/src/test/resources/projects/forge/aw2At/build.gradle
+++ b/src/test/resources/projects/forge/aw2At/build.gradle
@@ -3,10 +3,15 @@ plugins {
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+java {
+	sourceCompatibility = JavaVersion.VERSION_1_8
+	targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+base {
+	archivesName = project.archives_base_name
+}
 
-archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
diff --git a/src/test/resources/projects/forge/externalModDependency/build.gradle b/src/test/resources/projects/forge/externalModDependency/build.gradle
index 821bb81c..fede83e9 100644
--- a/src/test/resources/projects/forge/externalModDependency/build.gradle
+++ b/src/test/resources/projects/forge/externalModDependency/build.gradle
@@ -3,10 +3,15 @@ plugins {
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+java {
+	sourceCompatibility = JavaVersion.VERSION_17
+	targetCompatibility = JavaVersion.VERSION_17
+}
+
+base {
+	archivesName = project.archives_base_name
+}
 
-archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
diff --git a/src/test/resources/projects/forge/legacyAw2AtMojmap/build.gradle b/src/test/resources/projects/forge/legacyAw2AtMojmap/build.gradle
index 1b319a1b..f0326ce3 100644
--- a/src/test/resources/projects/forge/legacyAw2AtMojmap/build.gradle
+++ b/src/test/resources/projects/forge/legacyAw2AtMojmap/build.gradle
@@ -3,10 +3,15 @@ plugins {
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+java {
+	sourceCompatibility = JavaVersion.VERSION_1_8
+	targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+base {
+	archivesName = project.archives_base_name
+}
 
-archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
diff --git a/src/test/resources/projects/forge/legacyAw2AtYarn/build.gradle b/src/test/resources/projects/forge/legacyAw2AtYarn/build.gradle
index 3e532cb5..967f2590 100644
--- a/src/test/resources/projects/forge/legacyAw2AtYarn/build.gradle
+++ b/src/test/resources/projects/forge/legacyAw2AtYarn/build.gradle
@@ -3,10 +3,15 @@ plugins {
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+java {
+	sourceCompatibility = JavaVersion.VERSION_1_8
+	targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+base {
+	archivesName = project.archives_base_name
+}
 
-archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
diff --git a/src/test/resources/projects/forge/loggerConfig/build.gradle b/src/test/resources/projects/forge/loggerConfig/build.gradle
index 83bc11f5..d6865c5e 100644
--- a/src/test/resources/projects/forge/loggerConfig/build.gradle
+++ b/src/test/resources/projects/forge/loggerConfig/build.gradle
@@ -2,7 +2,10 @@ plugins {
 	id 'dev.architectury.loom'
 }
 
-archivesBaseName = project.archives_base_name
+base {
+	archivesName = project.archives_base_name
+}
+
 version = project.mod_version
 group = project.maven_group
 
diff --git a/src/test/resources/projects/forge/simple/build.gradle b/src/test/resources/projects/forge/simple/build.gradle
index dcee84dc..1f540a39 100644
--- a/src/test/resources/projects/forge/simple/build.gradle
+++ b/src/test/resources/projects/forge/simple/build.gradle
@@ -3,10 +3,15 @@ plugins {
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+java {
+	sourceCompatibility = JavaVersion.VERSION_1_8
+	targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+base {
+	archivesName = project.archives_base_name
+}
 
-archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
diff --git a/src/test/resources/projects/forge/simpleMixinAp/build.gradle b/src/test/resources/projects/forge/simpleMixinAp/build.gradle
index 77e21352..a8f55014 100644
--- a/src/test/resources/projects/forge/simpleMixinAp/build.gradle
+++ b/src/test/resources/projects/forge/simpleMixinAp/build.gradle
@@ -3,10 +3,15 @@ plugins {
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+java {
+	sourceCompatibility = JavaVersion.VERSION_17
+	targetCompatibility = JavaVersion.VERSION_17
+}
+
+base {
+	archivesName = project.archives_base_name
+}
 
-archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group