Gradle 7.x support - Fixed build errors

BerndiVader · Jul 11, 2021 · 3c7d99e · 3c7d99e
1 parent 84e222f
commit 3c7d99e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 57 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,15 @@
 apply plugin: 'java'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 repositories {
     mavenCentral()
     maven {
         url "http://mc.hackerzlair.org:8888/repository/public"
+        allowInsecureProtocol = true
     }
     maven {
         url = "http://repo.extendedclip.com/content/repositories/placeholderapi/"
+        allowInsecureProtocol = true
     }
  }
 
@@ -37,7 +39,7 @@ dependencies {
 }
 
 processResources {
-
+    duplicatesStrategy = 'include'
     print("Process properties....")
     Properties p1=new Properties()
     File pf1=new File("$project.projectDir/gradle.properties")
@@ -71,48 +73,10 @@ compileJava {
 
     doLast {
         print("Create POM file....")
-        pom {
-            project {
-                groupId project.group
-                artifactId project.name
-                version project.version
-            }
-        }.writeTo("./build/libs/"+project.name+"-"+project.version+".xml")
-        println("Done!")
+	subprojects {
+	  group = 'com.mythicmobsextension'
+	  task generatePom << { pom { }.writeTo("./build/libs/"+project.name+"-"+project.version+".xml")
+        println("Done!")}}
     }
 
 }
-
-uploadArchives {
-    doLast {
-        print("Update repository files....")
-	def d1=project.projectDir
-	Properties archiva=new Properties()
-
-        File data=new File("${d1}/../usr.properties")
-	if(data.exists())
-        {
-            archiva.load(data.newDataInputStream())
-            def usr=archiva.getProperty('usr')
-            def pwd=archiva.getProperty('pwd')
-
-
-            repositories.mavenDeployer {
-                    repository(url:'http://mc.hackerzlair.org:8888/repository/public/') {
-                            authentication (userName: '${usr}', password: '${pwd}')
-                    }
-
-                    pom.version=project.version
-                    pom.artifactId=project.name
-                    pom.groupId='com.gmail.berndivader'
-            }
-            println("Done!")
-        }
-        else
-        {
-            println("Archiva config file is missing. Repository not updated!")
-        }
-    }
-
-}
-
diff --git a/src/main/java/com/gmail/berndivader/mythicmobsext/mechanics/Trade.java b/src/main/java/com/gmail/berndivader/mythicmobsext/mechanics/Trade.java
@@ -34,25 +34,14 @@ public class Trade extends SkillMechanic implements ITargetedEntitySkill{
 	String title;
 	List<String> tradesRaw = new ArrayList<>();
 
-<<<<<<< HEAD
 	public Trade(String line, MythicLineConfig MythicLineConfig) {
 		super(line, MythicLineConfig);
-		this.ASYNC_SAFE = false;
+		this.threadSafetyLevel = AbstractSkill.ThreadSafetyLevel.SYNC_ONLY;
 		title = MythicLineConfig.getString(new String[] { "title", "t"}, "Trades");
 		for (int index = 1; index <= 10; index++) {
 			String x = MythicLineConfig.getString(new String[] {String.valueOf(index)}, "none");
-=======
-	public Trade(String line, MythicLineConfig mlc) {
-		super(line, mlc);
-		this.threadSafetyLevel = AbstractSkill.ThreadSafetyLevel.SYNC_ONLY;
-
-		title = mlc.getString(new String[] { "title", "t"}, "Trades");
-		for (int i = 1; i <= 10; i++) {
-			String x = mlc.getString(new String[] {String.valueOf(i)}, "none");
->>>>>>> 45ef248a2002d4837839f5506555fa74bc88e713
-
 			if (!x.equals("none")) tradesRaw.add(x);
-		}
+			}
 	}
 
 	@Override