clean up build

Author: jpe7s

.github/workflows/gradle.yml

@@ -40,6 +40,6 @@ jobs:
         run: |
           printf "\norg.gradle.java.installations.paths=%s" "$JAVA_HOME" >> gradle.properties
           java --version
-          ./gradlew -PtargetJava=${{ vars.JAVA_VERSION }} check --stacktrace --no-daemon
+          ./gradlew -PjavaVersion=${{ vars.JAVA_VERSION }} check --stacktrace --no-daemon
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -40,6 +40,6 @@ jobs:
         run: |
           printf "\norg.gradle.java.installations.paths=%s" "$JAVA_HOME" >> gradle.properties
           java --version
-          ./gradlew --stacktrace --no-daemon -PtargetJava=${{ vars.JAVA_VERSION }} check publish
+          ./gradlew --stacktrace --no-daemon -PjavaVersion=${{ vars.JAVA_VERSION }} -Pversion=${{ github.ref_name }}} check publish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -1,28 +1,5 @@
-def getAppVersion = { ->
-  try (final var gitTagOut = new ByteArrayOutputStream()) {
-    exec {
-      commandLine 'git', 'tag', '--points-at', 'HEAD'
-      standardOutput = gitTagOut
-    }
-    final var tagName = gitTagOut.toString().strip()
-    if (tagName.isBlank()) {
-      try (final var gitHashOut = new ByteArrayOutputStream()) {
-        exec {
-          commandLine 'git', 'rev-parse', '--short', 'HEAD'
-          standardOutput = gitHashOut
-        }
-        return 'git-' + gitHashOut.toString().strip()
-      }
-    } else {
-      return tagName
-    }
-  }
-} as Object
-
 ext {
-  VERSION = getAppVersion()
-  ORG = 'sava-software'
-  REPO = 'solana-programs'
+  VERSION = project.findProperty('version')
   VCS_URL = 'https://github.com/sava-software/solana-programs'
 }
 
@@ -32,7 +9,7 @@ apply plugin: 'maven-publish'
 project.group = 'software.sava'
 project.version = "$VERSION"
 
-final JLV = JavaLanguageVersion.of(project.findProperty('jv') as Integer ?: 23)
+final JLV = JavaLanguageVersion.of(project.findProperty('javaVersion') as Integer ?: 23)
 
 plugins.withType(JavaPlugin).configureEach {
   java {
@@ -75,29 +52,51 @@ test {
   useJUnitPlatform()
   testLogging {
     events "passed", "skipped", "failed", "standardOut", "standardError"
-    exceptionFormat "full"
-    showStandardStreams true
+    exceptionFormat = "full"
+    showStandardStreams = true
   }
 }
 
-tasks.register('sourcesJar', Jar) {
-  from sourceSets.main.allJava
-  archiveClassifier.set('sources')
+tasks.withType(Javadoc).configureEach {
+  options.addStringOption('Xdoclint:none', '-quiet')
+}
+
+java {
+  withJavadocJar()
+  withSourcesJar()
 }
 
 publishing {
   publications {
     mavenJava(MavenPublication) {
       from components.java
-      artifact sourcesJar
-      groupId project.group
-      artifactId project.name
+
+      groupId = project.group
+      artifactId = project.name
       version = project.version
+
       pom {
         name = project.name
+        description = "Native Solana & SPL Program Clients "
         url = "$VCS_URL"
+        licenses {
+          license {
+            name = 'GNU General Public License v3.0'
+            url = 'https://github.com/sava-software/solana-programs/blob/main/LICENSE'
+          }
+        }
+        developers {
+          developer {
+            name = 'Jim'
+            id = 'jpe7s'
+            email = '[email protected]'
+            organization = 'Sava Software'
+            organizationUrl = 'https://github.com/sava-software'
+          }
+        }
         scm {
           connection = 'scm:git:[email protected]:sava-software/solana-programs.git'
+          developerConnection = 'scm:git:[email protected]:sava-software/solana-programs.git'
           url = "$VCS_URL"
         }
       }
@@ -114,4 +113,4 @@ publishing {
       }
     }
   }
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -11,7 +11,7 @@ dependencyResolutionManagement {
   }
   versionCatalogs {
     libs {
-      from("software.sava:solana-version-catalog:0.4.78")
+      from("software.sava:solana-version-catalog:0.4.105")
     }
   }
 }