From ff3c16d0bb99199c1d434b9a22224882b60817b4 Mon Sep 17 00:00:00 2001 From: Craig Date: Tue, 19 Dec 2023 00:28:45 +0000 Subject: [PATCH] Fixes Maven for the command line without affecting Github Actions --- fabric/build.gradle | 7 +++---- forge/build.gradle | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/fabric/build.gradle b/fabric/build.gradle index 1a6f09e67..3f65b0b15 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -182,12 +182,11 @@ publishing { repositories { maven { - url = project.findProperty("maven_repo_url") ?: "http://craig.software:8081/repository/whocraft/" + url = "https://maven.craig.software/repository/whocraft/" credentials { - username = System.getenv("MAVEN_REPO_USERNAME") - password = System.getenv("MAVEN_REPO_PASSWORD") + username = project.findProperty("MAVEN_REPO_USERNAME") ?: System.getenv("MAVEN_REPO_USERNAME") ?: "" + password = project.findProperty("MAVEN_REPO_PASSWORD") ?: System.getenv("MAVEN_REPO_PASSWORD") ?: "" } - allowInsecureProtocol = true } } } \ No newline at end of file diff --git a/forge/build.gradle b/forge/build.gradle index 7930ea50d..6015237a1 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -155,12 +155,11 @@ publishing { repositories { maven { - url = project.findProperty("maven_repo_url") ?: "http://craig.software:8081/repository/whocraft/" + url = "https://maven.craig.software/repository/whocraft/" credentials { - username = System.getenv("MAVEN_REPO_USERNAME") - password = System.getenv("MAVEN_REPO_PASSWORD") + username = project.findProperty("MAVEN_REPO_USERNAME") ?: System.getenv("MAVEN_REPO_USERNAME") ?: "" + password = project.findProperty("MAVEN_REPO_PASSWORD") ?: System.getenv("MAVEN_REPO_PASSWORD") ?: "" } - allowInsecureProtocol = true } } }