diff --git a/README.md b/README.md index 99c0847..701d48f 100755 --- a/README.md +++ b/README.md @@ -6,6 +6,15 @@ This library provides a Java wrapper around all the methods exposed by a Polkado - [examples](https://github.com/polkadot-java/api/tree/master/examples) -- Demo projects (Gradle). - [examples_runnable](https://github.com/polkadot-java/api/tree/master/examples_runnable) -- Demo executable JARs. +## Build + +Integration test require local polkadot node running (run with `polkadot --dev`), +then +`./gradlew build` + +Alternatively build without running unit tests, but still compiling them +`./gradlew build testClasses -x test` + ## JDK Java 1.8 @@ -41,16 +50,15 @@ The project uses [Gradle](https://gradle.org/) as build tool. You need to instal ### Build the library with Gradle then link to the JAR 1. `git clone https://github.com/polkadot-java/api.git` -2. `cd api` 3. `gradle build` -4. Get the JARs in folder `build/libs/` -5. Add the JARs into your projects. +4. Check the JARs in folder `api/build/libs/` +5. Add the JARs into your projects (TODO publish on MavenCentral). ### Link to the source code directly, 1. `git clone https://github.com/polkadot-java/api.git` -2. Import the gradle project in folder api/packages to your workspace. -3. Add links or dependencies in the IDE. This is different in different IDEs, please reference to your IDE document. +2. Import the gradle project in folder `api` to your workspace. +3. Add links or dependencies in the IDE. This differs, please reference to your IDE help (IDEA, Eclipse). ## How to build and use sr25591 JNI diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..048a359 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +group=bcd.polkadot +version=1.1-SNAPSHOT diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..5c2d1cf Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1ed0531 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ + +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..83f2acf --- /dev/null +++ b/gradlew @@ -0,0 +1,188 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$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"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +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. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..24467a1 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/packages/build.gradle b/packages/build.gradle index 20e42cd..643fc90 100644 --- a/packages/build.gradle +++ b/packages/build.gradle @@ -1,68 +1,84 @@ plugins { id('java') - id('maven') + //id('maven') id('idea') id('eclipse') id('application') - id('signing') + //id('signing') } // Group Name which has to be registered with the central OOSRH (sonatype org) group = "io.github.polkadot-java" archivesBaseName = "polkadot-java" -version '1.0-SNAPSHOT' +version '1.1-SNAPSHOT' sourceCompatibility = 1.8 targetCompatibility = 1.8 mainClassName = 'org.polkadot.example.SimpleConnect' + repositories { mavenCentral() - maven { - url "https://repo.boundlessgeo.com/main/" + //maven { url "https://repo.boundlessgeo.com/main/" } // This site can’t be reached over DNS error, For what was it here? + maven { url "https://jitpack.io" + // on demand GitHub repositories build ONLY for com.onehilltech.promises:promises-jvm + // as suggested by https://github.com/onehilltech/promises README. + + // https://docs.gradle.org/current/userguide/declaring_repositories.html#sec:repository-content-filtering + content { + // this repository *only* contains artifacts with group "io.emeraldpay.polkaj" + includeGroup "com.onehilltech.promises" + } } - maven { url "https://jitpack.io" } + //maven { url "https://repo.spring.io/libs-release/" } // ONLY for com.onehilltech.promises:promises-jvm, + // onehilltech.promises is listed by not available there } dependencies { - compile fileTree(dir: 'libs', includes: ['*jar']) + //compile fileTree(dir: 'libs', includes: ['*jar']) // Has no jars // compile group: 'it.unimi.dsi', name: 'fastutil', version: '8.1.0' // https://mvnrepository.com/artifact/org.jdeferred.v2/jdeferred-core // compile group: 'org.jdeferred.v2', name: 'jdeferred-core', version: '2.0.0-beta2' -// https://mvnrepository.com/artifact/io.reactivex.rxjava2/rxjava - compile group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.8' + // https://mvnrepository.com/artifact/io.reactivex.rxjava2/rxjava + //compile group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.8' + compile group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.21' //(Feb 13, 2021) // https://mvnrepository.com/artifact/com.github.briandilley.jsonrpc4j/jsonrpc4j compile group: 'com.github.briandilley.jsonrpc4j', name: 'jsonrpc4j', version: '1.5.3' -// https://mvnrepository.com/artifact/org.java-websocket/Java-WebSocket - compile group: 'org.java-websocket', name: 'Java-WebSocket', version: '1.4.0' + // https://mvnrepository.com/artifact/org.java-websocket/Java-WebSocket + //compile group: 'org.java-websocket', name: 'Java-WebSocket', version: '1.4.0' + compile group: 'org.java-websocket', name: 'Java-WebSocket', version: '1.5.2' //(Apr 05, 2021) // https://mvnrepository.com/artifact/com.alibaba/fastjson - compile group: 'com.alibaba', name: 'fastjson', version: '1.2.48' - compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.8' -// https://mvnrepository.com/artifact/com.google.guava/guava - compile group: 'com.google.guava', name: 'guava', version: '27.1-jre' + //compile group: 'com.alibaba', name: 'fastjson', version: '1.2.48' + compile group: 'com.alibaba', name: 'fastjson', version: '1.2.76' //(Apr 05, 2021) + // https://mvnrepository.com/artifact/com.google.guava/guava + //compile group: 'com.google.guava', name: 'guava', version: '27.1-jre' + compile group: 'com.google.guava', name: 'guava', version: '30.1.1-jre' //(Mar 19, 2021) //TODO Is this only transitive for rxjava? // https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 - compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.8' + //compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.8' + //compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.8' //This is usually just transitive dependency // https://mvnrepository.com/artifact/org.apache.commons/commons-collections4 compile group: 'org.apache.commons', name: 'commons-collections4', version: '4.2' // for JVM-only projects - compile 'com.onehilltech.promises:promises-jvm:0.10.3' + // https://mvnrepository.com/artifact/com.onehilltech.promises/promises-jvm + compile 'com.onehilltech.promises:promises-jvm:0.10.3' // (Jan 15, 2020), NOTE rarely used, + // listed ONLY in spring-libs repository, but not really available there. // https://mvnrepository.com/artifact/org.jooq/joou-java-6 compile group: 'org.jooq', name: 'joou-java-6', version: '0.9.4' -// https://mvnrepository.com/artifact/org.jooq/jool-java-8 + // https://mvnrepository.com/artifact/org.jooq/jool-java-8 compile group: 'org.jooq', name: 'jool-java-8', version: '0.9.14' -// https://mvnrepository.com/artifact/org.jooq/joor-java-8 + // https://mvnrepository.com/artifact/org.jooq/joor-java-8 compile group: 'org.jooq', name: 'joor-java-8', version: '0.9.11' compile 'net.i2p.crypto:eddsa:0.3.0' @@ -81,9 +97,10 @@ dependencies { // https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient - compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6' + //compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6' + compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13' //(Oct 06, 2020) // https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore - compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.8' + //compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.8' //Transitive for httpclient implementation 'org.lz4:lz4-java:1.5.1' @@ -97,7 +114,6 @@ javadoc { } tasks { - task javadocJar(type: Jar) { classifier = 'javadoc' from javadoc @@ -107,7 +123,7 @@ tasks { from sourceSets.main.allSource } } - +/* Section below and 2 plugins were diabled // javadoc removed artifacts { archives javadocJar,sourcesJar @@ -163,4 +179,5 @@ uploadArchives { } } } -} \ No newline at end of file +} +*/ diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..0168b64 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name = 'polkadot-java' + +include 'packages'