diff --git a/build.gradle b/build.gradle index 43d4d5f..6603baf 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,14 @@ plugins { id 'java' + id 'java-library' + id 'maven-publish' id 'checkstyle' id 'com.github.johnrengelman.shadow' version '7.1.2' + id 'org.jreleaser' version '1.14.0' } group = 'com.lmax' -version = '1.0' +version = '1.0.0' repositories { mavenCentral() @@ -20,6 +23,8 @@ java { toolchain { languageVersion = JavaLanguageVersion.of(11) } + withJavadocJar() + withSourcesJar() } configurations { @@ -69,8 +74,8 @@ dependencies { testSupportImplementation 'org.assertj:assertj-core:3.25.3' testSupportImplementation 'org.junit.jupiter:junit-jupiter:5.10.2' testSupportImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2' - testSupportImplementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' - testSupportImplementation 'com.fasterxml.jackson.core:jackson-databind:2.17.1' + testSupportImplementation 'com.fasterxml.jackson.core:jackson-core:2.17.2' + testSupportImplementation 'com.fasterxml.jackson.core:jackson-databind:2.17.2' testSupportImplementation 'org.apache.httpcomponents:httpclient:4.5.14' testSupportImplementation 'org.bouncycastle:bcprov-jdk18on:1.78.1' @@ -86,8 +91,8 @@ dependencies { integrationTestImplementation 'com.lmax:simple-dsl:3.0.0' integrationTestImplementation 'org.assertj:assertj-core:3.25.3' integrationTestImplementation 'org.junit.jupiter:junit-jupiter:5.10.2' - integrationTestImplementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' - integrationTestImplementation 'com.fasterxml.jackson.core:jackson-databind:2.17.1' + integrationTestImplementation 'com.fasterxml.jackson.core:jackson-core:2.17.2' + integrationTestImplementation 'com.fasterxml.jackson.core:jackson-databind:2.17.2' integrationTestImplementation 'org.apache.httpcomponents:httpclient:4.5.14' integrationTestImplementation 'org.bouncycastle:bcprov-jdk18on:1.78.1' integrationTestImplementation 'org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1' @@ -141,9 +146,63 @@ task setUpGitHooks(type: Exec, description: 'Add a pre-commit git hook that runs commandLine 'git', 'config', 'core.hooksPath', hooksFolder } -tasks.register('sourcesJar', Jar) { - archiveClassifier.set('sources') - from sourceSets.main.allSource +check.dependsOn integrationTest + +publishing { + publications { + maven(MavenPublication) { + groupId = 'com.lmax' + artifactId = 'solana4j' + + from components.java + + pom { + name = 'solana4j' + description = 'A Java library for natively interacting with the Solana blockchain.' + url = 'https://github.com/LMAX-Exchange/solana4j' + inceptionYear = '2023' + licenses { + license { + name = 'Apache-2.0' + url = 'https://spdx.org/licenses/Apache-2.0.html' + } + } + developers { + developer { + id = 'jamesm' + name = 'Matthew James' + } + } + scm { + connection = 'scm:git:https://github.com/LMAX-Exchange/solana4j.git' + developerConnection = 'scm:git:ssh://github.com/LMAX-Exchange/solana4j.git' + url = 'https://github.com/LMAX-Exchange/solana4j' + } + } + } + } + + repositories { + maven { + url = layout.buildDirectory.dir('staging-deploy') + } + } } -check.dependsOn integrationTest \ No newline at end of file +jreleaser { + signing { + active = 'ALWAYS' + armored = true + } + deploy { + maven { + mavenCentral { + sonatype { + active = 'ALWAYS' + url = 'https://central.sonatype.com/api/v1/publisher' + stagingRepository('target/staging-deploy') + } + } + } + } +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..033e24c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82f365..d11cdd9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Fri May 17 09:37:07 EDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..fcb6fca 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +130,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +197,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +213,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal