Android support milestone2

.github/workflows/publish.yaml

@@ -62,6 +62,8 @@ jobs:
         with:
           name: schnorrkel-lib
           path: polkaj-schnorrkel/build/rust/release
+      - name: Setup Rust for Android
+        run: ./cargo_ndk_prep.sh; touch local.properties
       - name: Check
         uses: eskatos/gradle-command-action@v1
         with:

.github/workflows/test.yaml

@@ -19,8 +19,9 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'adopt'
           java-version: 11
 
       - name: Check
@@ -38,6 +39,24 @@ jobs:
         with:
           file: ./build/reports/jacoco/coverageReport/coverageReport.xml
 
+  # Run tests for java 8 targets
+  java8-test:
+    name: Java 8 Test
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: 8
+
+      - name: Check
+        uses: eskatos/gradle-command-action@v1
+        with:
+          arguments: checkJava8
+
   # Make sure it works with all standard JVMs on main OSes
   platform-test:
     name: Java ${{ matrix.java }} on ${{ matrix.os }}
@@ -51,8 +70,9 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'adopt'
           java-version: ${{ matrix.java }}
 
       - name: Check
@@ -62,6 +82,33 @@ jobs:
           wrapper-cache-enabled: false
           arguments: check
 
+  #Test with android emulators provided
+  android-platform-test:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        api-level: [24, 25, 26, 28, 29, 30]
+        arch: [x86_64, x86]
+#        include:
+#         - api-level: 30
+#           arch: arm64-v8a  ## Currently this github action isn't able to start any arm emulators
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Rust
+        run: ./cargo_ndk_prep.sh; touch local.properties
+
+      - name: run tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+#          ndk: 21.4.7075529 ## This would install the correct NDK version, but it's already installed in the image.
+          api-level: ${{ matrix.api-level }}
+          arch: ${{ matrix.arch }}
+          target: google_apis
+          script: ./gradlew connectedCheck
+
   # Formatter may behave differently on different locales, makes sure tests are not failing
   locale-test:
     name: Locale ${{ matrix.locale }}
@@ -73,14 +120,18 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Setup Rust
+        run: ./cargo_ndk_prep.sh
+
       - name: Set Locale
         run: |
           sudo locale-gen ${{ matrix.locale }}
           sudo update-locale LANG=${{ matrix.locale }}
 
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'adopt'
           java-version: 11
 
       - name: Check

.gitignore

@@ -21,3 +21,5 @@ scripts
 
 .gradle
 build
+
+local.properties

README.adoc

@@ -20,12 +20,14 @@ WARNING: UNDER DEVELOPMENT
 - `io.emeraldpay.polkaj:polkaj-scale:{lib-version}` - SCALE codec implementation
 - `io.emeraldpay.polkaj:polkaj-scale-types:{lib-version}` - SCALE mapping for standard Polkadot types
 - `io.emeraldpay.polkaj:polkaj-schnorrkel:{lib-version}` - Schnorrkel for Java
+- `io.emeraldpay.polkaj:polkaj-schnorrkel-android:{lib-version-dev}` - Schnorrkel for Android
 - `io.emeraldpay.polkaj:polkaj-ss58:{lib-version}` - SS58 codec to encode/decode addresses and pubkeys
 - `io.emeraldpay.polkaj:polkaj-common-types:{lib-version}` - common types (Address, DotAmount, Hash256, etc)
 - `io.emeraldpay.polkaj:polkaj-json-types:{lib-version}` - JSON RPC mapping to Java classes
 - `io.emeraldpay.polkaj:polkaj-api-base:{lib-version}` - RPC base classes
 - `io.emeraldpay.polkaj:polkaj-api-http:{lib-version}` - JSON RPC HTTP client
 - `io.emeraldpay.polkaj:polkaj-api-ws:{lib-version}` - JSON RPC WebSocket client
+- `io.emeraldpay.polkaj:polkaj-api-okhttp:{lib-version-dev}` - JSON RPC and WebSocket client using OkHttp
 - `io.emeraldpay.polkaj:polkaj-tx:{lib-version}` - Storage access and Extrinsics
 
 == Usage
@@ -34,7 +36,7 @@ To use development SNAPSHOT versions you need to install the library into the lo
 
 .Install into local Maven
 ----
-gradle install
+./gradlew publishToMavenLocal
 ----
 
 .Using with Gradle
@@ -48,7 +50,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'io.emeraldpay.polkaj:polkaj-api-http:{lib-version}'
+    implementation 'io.emeraldpay.polkaj:polkaj-api-http:{lib-version-dev}'
 }
 ----
 
@@ -61,7 +63,7 @@ See link:docs/[Documentation] in `./docs` directory, and a demonstration in `./e
 .Show current finalized block
 [source,java]
 ----
-PolkadotHttpApi client = PolkadotApi.newBuilder()
+PolkadotApi client = PolkadotApi.newBuilder()
     .rpcCallAdapter(JavaHttpAdapter.newBuilder().build())
     .build();
 Future<Hash256> hashFuture = client.execute(

build.gradle

@@ -1,7 +1,20 @@
 buildscript {
 
+    ext.kotlin_version = '1.5.30'
+    ext.kotlin_coroutine_version = '1.5.2'
+
+    repositories {
+        google()
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+        mavenCentral()
+    }
     dependencies {
         classpath 'com.netflix.nebula:gradle-aggregate-javadocs-plugin:3.0.1'
+        classpath "com.android.tools.build:gradle:4.2.2"
+        classpath "gradle.plugin.com.github.willir.rust:plugin:0.3.4"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
@@ -29,7 +42,7 @@ allprojects {
 }
 
 jacoco {
-    toolVersion = "0.8.5"
+    toolVersion = "0.8.7"
 }
 
 task coverageReport(type: JacocoReport) {
@@ -48,6 +61,8 @@ task syncJars(type: Sync) {
     into "${buildDir}/libs/"
 }
 
+task checkJava8
+
 // Skip Bintray for the root module
 bintray {
     dryRun=true

cargo_ndk_prep.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
+cargo install cargo-ndk

common_java_app.gradle

@@ -1,6 +1,5 @@
 apply plugin: 'java'
 apply plugin: 'java-library'
-apply plugin: 'maven'
 apply plugin: 'maven-publish'
 apply plugin: 'groovy'
 apply plugin: 'jacoco'
@@ -10,13 +9,22 @@ afterEvaluate {
     rootProject.tasks.coverageReport.additionalSourceDirs.setFrom rootProject.tasks.coverageReport.additionalSourceDirs.files + files(it.sourceSets.main.allSource.srcDirs)
     rootProject.tasks.coverageReport.sourceDirectories.setFrom rootProject.tasks.coverageReport.sourceDirectories.files + files(it.sourceSets.main.allSource.srcDirs)
     rootProject.tasks.coverageReport.classDirectories.setFrom rootProject.tasks.coverageReport.classDirectories.files + files(it.sourceSets.main.output)
-}
 
+    //By default we set to java 8 but some project override this to higher levels so after evaluate we
+    if(java.sourceCompatibility == JavaVersion.VERSION_1_8){
+        rootProject.tasks.checkJava8.dependsOn(test)
+    }
+}
 
 tasks.withType(JavaCompile) {
     options.debug = true
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
 compileJava {
     targetCompatibility = '8'
     sourceCompatibility = '8'
@@ -79,7 +87,7 @@ artifacts {
 }
 
 jacoco {
-    toolVersion = "0.8.5"
+    toolVersion = "0.8.7"
 }
 
 publishing {

examples/README.adoc

@@ -25,18 +25,18 @@ cd types
 == RPC
 
 Examples for accessing JSON RPC through HTTP or WebSockets.
-The examples expect Polkadot node running and listening for RPC and WS requests on the localhost (i.e. default node options)
+The examples expect Polkadot node running and listening for RPC and WS requests on the localhost (i.e. default node options). In any of the following examples you can pass the optional `--args="okhttp"` to the run command to use the Java 8 compatible OkHttp implementation of the RPC and WebSocket adapters.
 
 .Show current head
 ----
 cd rpc
-./gradlew run
+./gradlew run --args="okhttp"
 ----
 
 .Follow updates to the current head (use `Ctrl+C` to exit)
 ----
 cd rpc
-./gradlew run -PmainClass=FollowState
+./gradlew run -PmainClass=FollowState --args="okhttp"
 ----
 
 .Describe runtime
@@ -45,6 +45,9 @@ cd rpc
 ./gradlew run -PmainClass=DescribeRuntime
 ----
 
+NOTE: Currently, only runtimes with Metadata are is supported https://github.com/paritytech/polkadot/releases/tag/v0.8.30[v0.8.30] is suitable version to test with.
+
+
 == Runtime Explorer
 
 A web-based explorer of the Runtime Metadata.
@@ -78,6 +81,9 @@ cd balance
 
 NOTE: To run a development network use: `polkadot --dev`
 
+NOTE: Currently, only runtimes with Metadata are is supported https://github.com/paritytech/polkadot/releases/tag/v0.8.30[v0.8.30] is suitable version to test with.
+
+
 .Transfer using real network (ex. Kusama)
 ----
 cd balance

examples/balance/build.gradle

@@ -13,6 +13,7 @@ apply from: '../common.gradle'
 dependencies {
     implementation "io.emeraldpay.polkaj:polkaj-api-http:$polkajVersion"
     implementation "io.emeraldpay.polkaj:polkaj-api-ws:$polkajVersion"
+    implementation "io.emeraldpay.polkaj:polkaj-api-okhttp:$polkajVersion"
     implementation "io.emeraldpay.polkaj:polkaj-json-types:$polkajVersion"
     implementation "io.emeraldpay.polkaj:polkaj-scale-types:$polkajVersion"
     implementation "io.emeraldpay.polkaj:polkaj-tx:$polkajVersion"

examples/balance/src/main/java/Balance.java

@@ -1,15 +1,22 @@
 import io.emeraldpay.polkaj.api.PolkadotApi;
+import io.emeraldpay.polkaj.api.RpcCallAdapter;
 import io.emeraldpay.polkaj.apihttp.JavaHttpAdapter;
+import io.emeraldpay.polkaj.apiokhttp.OkHttpRpcAdapter;
 import io.emeraldpay.polkaj.scaletypes.AccountInfo;
 import io.emeraldpay.polkaj.tx.AccountRequests;
 import io.emeraldpay.polkaj.types.Address;
 import io.emeraldpay.polkaj.types.DotAmount;
 import io.emeraldpay.polkaj.types.DotAmountFormatter;
 
+import java.util.Arrays;
+
 public class Balance {
 
     public static void main(String[] args) throws Exception {
-        try (PolkadotApi client = PolkadotApi.newBuilder().rpcCallAdapter(JavaHttpAdapter.newBuilder().build()).build()) {
+        final boolean useOkhttp = Arrays.asList(args).contains("okhttp");
+        final RpcCallAdapter adapter = useOkhttp ? OkHttpRpcAdapter.newBuilder().build() :
+                JavaHttpAdapter.newBuilder().build();
+        try (PolkadotApi client = PolkadotApi.newBuilder().rpcCallAdapter(adapter).build()) {
             DotAmountFormatter formatter = DotAmountFormatter.autoFormatter();
 
             DotAmount total = AccountRequests.totalIssuance().execute(client).get();

examples/balance/src/main/java/Transfer.java

@@ -1,4 +1,5 @@
 import io.emeraldpay.polkaj.api.*;
+import io.emeraldpay.polkaj.apiokhttp.OkHttpSubscriptionAdapter;
 import io.emeraldpay.polkaj.apiws.JavaHttpSubscriptionAdapter;
 import io.emeraldpay.polkaj.scale.ScaleExtract;
 import io.emeraldpay.polkaj.scaletypes.AccountInfo;
@@ -49,9 +50,16 @@ public static void main(String[] args) throws Exception {
                 Math.abs(random.nextLong()) % DotAmount.fromDots(0.002).getValue().longValue()
         );
 
-        final JavaHttpSubscriptionAdapter adapter = JavaHttpSubscriptionAdapter.newBuilder().connectTo(api).build();
+        boolean useOkhttp = true;
+        final SubscriptionAdapter adapter = useOkhttp ?
+                OkHttpSubscriptionAdapter.newBuilder().connectTo(api).build() :
+                JavaHttpSubscriptionAdapter.newBuilder().connectTo(api).build();
         try (PolkadotApi client = PolkadotApi.newBuilder().subscriptionAdapter(adapter).build()) {
-            System.out.println("Connected: " + adapter.connect().get());
+            if(adapter instanceof JavaHttpSubscriptionAdapter){
+                //Connect call not required for OkHttp
+                CompletableFuture<Boolean> connected = ((JavaHttpSubscriptionAdapter)adapter).connect();
+                System.out.println("Connected: " + connected.get());
+            }
 
             // Subscribe to block heights
             AtomicLong height = new AtomicLong(0);

examples/rpc/build.gradle

@@ -13,11 +13,12 @@ apply from: '../common.gradle'
 dependencies {
     implementation "io.emeraldpay.polkaj:polkaj-api-http:$polkajVersion"
     implementation "io.emeraldpay.polkaj:polkaj-api-ws:$polkajVersion"
+    implementation "io.emeraldpay.polkaj:polkaj-api-okhttp:$polkajVersion"
     implementation "io.emeraldpay.polkaj:polkaj-json-types:$polkajVersion"
     implementation "io.emeraldpay.polkaj:polkaj-scale-types:$polkajVersion"
     implementation 'commons-codec:commons-codec:1.14'
 }
 
 application {
-    mainClassName = project.hasProperty("mainClass") ? getProperty("mainClass") : "ShowState"
+    mainClassName = findProperty("mainClass") ?: "ShowState"
 }

examples/rpc/src/main/java/DescribeRuntime.java

@@ -1,10 +1,13 @@
 import io.emeraldpay.polkaj.api.PolkadotApi;
+import io.emeraldpay.polkaj.api.RpcCallAdapter;
 import io.emeraldpay.polkaj.api.StandardCommands;
 import io.emeraldpay.polkaj.apihttp.JavaHttpAdapter;
+import io.emeraldpay.polkaj.apiokhttp.OkHttpRpcAdapter;
 import io.emeraldpay.polkaj.scale.ScaleExtract;
 import io.emeraldpay.polkaj.scaletypes.Metadata;
 import io.emeraldpay.polkaj.scaletypes.MetadataReader;
 
+import java.util.Arrays;
 import java.util.concurrent.Future;
 
 /**
@@ -13,8 +16,11 @@
 public class DescribeRuntime {
 
     public static void main(String[] args) throws Exception {
+        final boolean useOkhttp = Arrays.stream(args).anyMatch(arg -> arg.equals("okhttp"));
+        final RpcCallAdapter adapter = useOkhttp ? OkHttpRpcAdapter.newBuilder().build() :
+                JavaHttpAdapter.newBuilder().build();
         PolkadotApi api = PolkadotApi.newBuilder()
-                .rpcCallAdapter(JavaHttpAdapter.newBuilder().build())
+                .rpcCallAdapter(adapter)
                 .build();
         Future<Metadata> metadataFuture = api.execute(StandardCommands.getInstance().stateMetadata())
                 .thenApply(ScaleExtract.fromBytesData(new MetadataReader()));