merge

CHANGELOG.md

@@ -1,5 +1,57 @@
 # Changelog
 
+## v0.5.2 (2020-01-31)
+
+### Added
+
+* [#715](https://github.com/zeromq/jeromq/pull/715): Added a ZCert constructor
+  that takes a Writer as an argument, in order to support writing to the
+  Writer instead of to a file.
+
+* [#716](https://github.com/zeromq/jeromq/pull/716): Added a ZTicket API, as
+  well as a ZTicker API, which combines ZTimer and ZTicket.
+
+* [#724](https://github.com/zeromq/jeromq/pull/724): Added support for the XPUB
+  options `ZMQ_XPUB_MANUAL` and `ZMQ_XPUB_VERBOSER`.
+
+* [#727](https://github.com/zeromq/jeromq/pull/727): Added a ZSocket constructor
+  that takes a SocketType enum value as an argument.
+
+* [#747](https://github.com/zeromq/jeromq/pull/747): Improvements to
+  ZBeacon:
+  * Added `startClient` and `startServer` methods, to support restarting the
+    client or server individually.
+  * You can now specify the interface address when constructing a
+    BroadcastClient.
+
+* [#755](https://github.com/zeromq/jeromq/pull/755): Added ZCert constructors
+  that take (mandatory) public and (optional) secret keys as arguments.
+
+### Changed
+
+* Fixes for Android compatibility:
+  * [#710](https://github.com/zeromq/jeromq/pull/710): Use traditional loops
+    instead of streams.
+  * [#717](https://github.com/zeromq/jeromq/pull/717): Don't use
+    `Map.computeIfAbsent`.
+  * [#736](https://github.com/zeromq/jeromq/pull/736): Use java.util.Iterator
+    instead of lambdas.
+  * [#752](https://github.com/zeromq/jeromq/pull/752): Various fixes discovered
+    by creating an Android project within the JeroMQ repo for testing purposes.
+
+* [#720](https://github.com/zeromq/jeromq/pull/720): Removed a println debug
+  statement in `Poller.rebuildSelector`.
+
+* [#733](https://github.com/zeromq/jeromq/pull/733): Fixed a bug introduced in
+  JeroMQ 0.5.1 where `ZPoller.poll` was returning -1 instead of 1.
+
+* [#735](https://github.com/zeromq/jeromq/pull/735): Fixed bugs related to
+  the handling of bytes in the Msg class.
+
+* [#759](https://github.com/zeromq/jeromq/pull/759): Fixed an
+  IndexOutOfBoundsException that occurs when the number of subscriptions exceeds
+  the HWM.
+
 ## v0.5.1 (2019-04-03)
 
 ### Added

README.md

@@ -141,7 +141,7 @@ JeroMQ.
 
 ## License
 
-All source files are copyright © 2007-2018 contributors as noted in the AUTHORS file.
+All source files are copyright © 2007-2020 contributors as noted in the AUTHORS file.
 
 Free use of this software is granted under the terms of the Mozilla Public License 2.0. For details see the file `LICENSE` included with the JeroMQ distribution.
 

pom.xml

@@ -3,7 +3,7 @@
   <groupId>org.zeromq</groupId>
   <artifactId>jeromq</artifactId>
   <packaging>jar</packaging>
-  <version>0.5.2-SNAPSHOT</version>
+  <version>0.5.3-SNAPSHOT</version>
   <name>JeroMQ</name>
   <description>Pure Java implementation of libzmq</description>
   <url>https://github.com/zeromq/jeromq</url>
@@ -125,12 +125,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.1.0</version>
 		<dependencies>
 			<dependency>
 				<groupId>com.puppycrawl.tools</groupId>
 				<artifactId>checkstyle</artifactId>
-				<version>8.18</version>
+				<version>8.29</version>
 			</dependency>
 		</dependencies>
         <executions>

scripts/prepare-android.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -ev
+
+ANDROID_ROOT=src/android/Jeromq/app/src/
+
+rm -fr $ANDROID_ROOT/main/java/{org,zmq}
+rm -fr $ANDROID_ROOT/androidTest/java/{org,zmq}
+
+cp -R src/main/java/{org,zmq} $ANDROID_ROOT/main/java
+cp -R src/test/java/{org,zmq} $ANDROID_ROOT/androidTest/java
+
+cp $ANDROID_ROOT/TemporaryFolderFinder.java $ANDROID_ROOT/androidTest/java/org/zeromq
+
+grep -rl zmq.util.AndroidProblematic $ANDROID_ROOT/androidTest/java | xargs -I @@ bash -c '{\
+ sed -i 's/zmq.util.AndroidProblematic/org.junit.Ignore/g' @@ ;\
+ sed -i 's/@AndroidProblematic/@Ignore/g' @@ ;\
+}'
+

src/android/Jeromq/.gitignore

@@ -0,0 +1,17 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+app/build/
+app/src/main/java/*
+app/src/androidTest/java/*

src/android/Jeromq/app/build.gradle

@@ -0,0 +1,38 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 28
+    buildToolsVersion "29.0.2"
+    defaultConfig {
+        applicationId "je.romq"
+        minSdkVersion 14
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArguments notAnnotation: 'zmq.util.AndroidProblematic'
+    }
+    compileOptions {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+    testOptions {
+        execution 'ANDROIDX_TEST_ORCHESTRATOR'
+    }
+}
+
+dependencies {
+    implementation 'eu.neilalexander:jnacl:1.0.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestUtil 'androidx.test:orchestrator:1.1.0'
+}

src/android/Jeromq/app/src/TemporaryFolderFinder.java

@@ -0,0 +1,16 @@
+package org.zeromq;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import java.io.File;
+
+public class TemporaryFolderFinder {
+
+    public static String resolve(String file)
+    {
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        return new File(appContext.getCacheDir(), file).getAbsolutePath();
+    }
+}

src/android/Jeromq/app/src/main/AndroidManifest.xml

@@ -0,0 +1,12 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="je.romq">
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <application
+        android:largeHeap="true"
+        android:allowBackup="false"
+        android:label="JeromqTester"
+        android:supportsRtl="true"
+        />
+</manifest>

src/android/Jeromq/build.gradle

@@ -0,0 +1,27 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        google()
+        jcenter()
+
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.5.2'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

src/android/Jeromq/gradle.properties

@@ -0,0 +1,20 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+

src/android/Jeromq/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Mon Nov 11 21:30:03 CET 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip