fix(build.gradle): Version fix

Version fix (probably) publish.gradle changes
GeorgeV220 · Oct 26, 2022 · 298e928 · 298e928
1 parent 1b415eb
commit 298e928
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -28,12 +28,6 @@ ext {
 }
 
 group project.property("group")
-def isCI = System.getenv("CI") ? true : false
-if (isCI) {
-    version("SNAPSHOT")
-} else {
-    version(project.property("version"))
-}
 
 compileJava {
     options.encoding = 'UTF-8'

diff --git a/gradle/publish.gradle b/gradle/publish.gradle
@@ -19,7 +19,7 @@ java {
 
 jar {
     manifest {
-        attributes (
+        attributes(
                 'Build-Jdk': "${System.properties['java.vendor']} ${System.properties['java.vm.version']}",
                 'Created-By': "Gradle ${gradle.gradleVersion}",
                 'Git-Branch': getBranch(),
@@ -33,23 +33,64 @@ publishing {
         shadow(MavenPublication) { publication ->
             project.shadow.component(publication)
             artifactId = project.getName().toLowerCase()
-            groupId = ((String)project.getGroup()).toLowerCase()
+            groupId = ((String) project.getGroup()).toLowerCase()
         }
     }
     repositories {
-        maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/${project.findProperty("GITHUB_REPOSITORY")?: System.getenv("GITHUB_REPOSITORY")}")
-            credentials {
-                username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR")
-                password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
+        def isGitHub = System.getenv("GITHUB_REPOSITORY") ? true : false
+        if (isGitHub) {
+            maven {
+                name = "GitHubPackages"
+                url = uri("https://maven.pkg.github.com/${project.findProperty("GITHUB_REPOSITORY") ?: System.getenv("GITHUB_REPOSITORY")}")
+                credentials {
+                    username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR")
+                    password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
+                }
+            }
+            maven {
+                maven {
+                    name = "GeorgeV22-Repository"
+
+                    url = uri("https://repo.georgev22.com/releases/")
+
+                    def mavenUsername = System.getenv("ORG_GRADLE_PROJECT_MAVENUSERNAME") ? System.getenv("ORG_GRADLE_PROJECT_MAVENUSERNAME") :
+                            System.getProperty("ORG_GRADLE_PROJECT_MAVENUSERNAME") ? System.getProperty("ORG_GRADLE_PROJECT_MAVENUSERNAME") : null
+                    def mavenPassword = System.getenv("ORG_GRADLE_PROJECT_MAVENPASSWORD") ? System.getenv("ORG_GRADLE_PROJECT_MAVENPASSWORD") :
+                            System.getProperty("ORG_GRADLE_PROJECT_MAVENPASSWORD") ? System.getProperty("ORG_GRADLE_PROJECT_MAVENPASSWORD") : null
+
+                    if (mavenUsername != null && mavenPassword != null) {
+                        credentials {
+                            username = mavenUsername
+                            password = mavenPassword
+                        }
+                    }
+                }
+            }
+        }
+        if (!isGitHub) {
+            maven {
+                name = "GeorgeV22-Repository"
+
+                url = uri("https://repo.georgev22.com/snapshots/")
+
+                def mavenUsername = System.getenv("ORG_GRADLE_PROJECT_MAVENUSERNAME") ? System.getenv("ORG_GRADLE_PROJECT_MAVENUSERNAME") :
+                        System.getProperty("ORG_GRADLE_PROJECT_MAVENUSERNAME") ? System.getProperty("ORG_GRADLE_PROJECT_MAVENUSERNAME") : null
+                def mavenPassword = System.getenv("ORG_GRADLE_PROJECT_MAVENPASSWORD") ? System.getenv("ORG_GRADLE_PROJECT_MAVENPASSWORD") :
+                        System.getProperty("ORG_GRADLE_PROJECT_MAVENPASSWORD") ? System.getProperty("ORG_GRADLE_PROJECT_MAVENPASSWORD") : null
+
+                if (mavenUsername != null && mavenPassword != null) {
+                    credentials {
+                        username = mavenUsername
+                        password = mavenPassword
+                    }
+                }
             }
         }
     }
 }
 
 javadoc {
-    if(JavaVersion.current().isJava9Compatible()) {
+    if (JavaVersion.current().isJava9Compatible()) {
         options.addBooleanOption('html5', true)
         options.addStringOption('Xdoclint:none', '-quiet')
     }