Skip to content
Permalink
Browse files

[Release] Merge branch 'release/1.8.0' into master.

  • Loading branch information...
Fleckol committed Apr 26, 2019
2 parents a03a447 + 908fece commit b7a92bad1cf2f093de080facd2c803560f4c6c26
Showing 778 changed files with 8,926 additions and 4,117 deletions.

This file was deleted.

Oops, something went wrong.
1 NOTICE
@@ -336,7 +336,6 @@ This project has dependencies to:
Jetty :: Websocket :: Server under Apache Software License - Version 2.0 or Eclipse Public License - Version 1.0
Jetty :: Websocket :: Servlet Interface under Apache Software License - Version 2.0 or Eclipse Public License - Version 1.0
Jetty :: XML utilities under Apache Software License - Version 2.0 or Eclipse Public License - Version 1.0
JLine under The BSD License
JMS 1.1 under The Apache Software License, Version 2.0
JMS 1.1 API under lgpl
JPA 2.0 API under Sun Binary Code License
@@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr</groupId>
<artifactId>android</artifactId>
<version>1.7.1</version>
<version>1.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr</groupId>
<artifactId>android</artifactId>
<version>1.7.1</version>
<version>1.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -18,13 +18,6 @@
*/
package io.joynr.joynrandroidruntime;

import io.joynr.arbitration.DiscoveryQos;
import io.joynr.exceptions.DiscoveryException;
import io.joynr.exceptions.JoynrRuntimeException;
import io.joynr.messaging.MessagingQos;
import io.joynr.proxy.ProxyBuilder;
import io.joynr.runtime.JoynrRuntime;

import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
@@ -33,6 +26,13 @@
import android.os.AsyncTask;
import android.util.Log;

import io.joynr.arbitration.DiscoveryQos;
import io.joynr.exceptions.DiscoveryException;
import io.joynr.exceptions.JoynrRuntimeException;
import io.joynr.messaging.MessagingQos;
import io.joynr.proxy.ProxyBuilder;
import io.joynr.runtime.JoynrRuntime;

public class AndroidProxyBuilder<T> extends AsyncTask<Object, String, T> implements ProxyBuilder<T> {

private JoynrRuntime runtime;
@@ -18,23 +18,26 @@
*/
package io.joynr.joynrandroidruntime;

import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Properties;

import android.content.Context;
import android.os.AsyncTask;
import android.util.Log;

import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.util.Modules;

import io.joynr.messaging.ConfigurableMessagingSettings;
import io.joynr.messaging.MessagingPropertyKeys;
import io.joynr.runtime.JoynrInjectorFactory;
import io.joynr.runtime.JoynrRuntime;
import io.joynr.runtime.LibjoynrWebSocketRuntimeModule;
import io.joynr.runtime.PropertyLoader;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Properties;

public class InitRuntimeTask extends AsyncTask<Object, String, JoynrRuntime> {

@@ -18,26 +18,26 @@
*/
package io.joynr.joynrandroidruntime;

import io.joynr.proxy.Future;
import io.joynr.proxy.ProxyBuilder;
import io.joynr.proxy.StatelessAsyncCallback;
import io.joynr.runtime.JoynrRuntime;

import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ExecutionException;

import joynr.types.ProviderQos;
import android.content.Context;
import android.os.AsyncTask;
import android.os.Messenger;
import android.util.Log;

import com.google.inject.Module;

import io.joynr.proxy.Future;
import io.joynr.proxy.ProxyBuilder;
import io.joynr.proxy.StatelessAsyncCallback;
import io.joynr.runtime.JoynrRuntime;
import joynr.types.ProviderQos;

public class JoynrAndroidRuntime implements JoynrRuntime {

protected InitRuntimeTask runtimeInitTask;
@@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr</groupId>
<artifactId>joynr</artifactId>
<version>1.7.1</version>
<version>1.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr</groupId>
<artifactId>android</artifactId>
<version>1.7.1</version>
<version>1.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -21,7 +21,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.joynr.android.test"
android:versionCode="1"
android:versionName="1.7.1">
android:versionName="1.8.0">

<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21"/>

@@ -18,8 +18,19 @@
*/
package io.joynr.android.robolectric;

import java.util.Properties;

import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;

import com.google.inject.Injector;
import com.google.inject.Module;

import io.joynr.android.test.TestActivity;
import io.joynr.arbitration.ArbitrationStrategy;
import io.joynr.arbitration.DiscoveryQos;
@@ -36,16 +47,6 @@
import joynr.types.ProviderQos;
import joynr.types.ProviderScope;

import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;

import java.util.Properties;

@RunWith(RobolectricTestRunner.class)
@Config(manifest = "./src/test/AndroidManifest.xml")
@Ignore
@@ -18,16 +18,17 @@
*/
package io.joynr.android.robolectric;

import io.joynr.android.test.TestActivity;
import io.joynr.integration.AbstractLocalCommunicationTest;
import io.joynr.runtime.JoynrRuntime;
import java.util.Properties;

import org.junit.Before;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;

import java.util.Properties;
import io.joynr.android.test.TestActivity;
import io.joynr.integration.AbstractLocalCommunicationTest;
import io.joynr.runtime.JoynrRuntime;

@RunWith(RobolectricTestRunner.class)
@Config(manifest = "./src/test/AndroidManifest.xml")
@@ -18,17 +18,19 @@
*/
package io.joynr.android.robolectric;

import com.google.inject.Module;
import io.joynr.android.test.TestActivity;
import io.joynr.integration.AbstractSSLEnd2EndTest;
import io.joynr.runtime.JoynrRuntime;
import java.util.Properties;

import org.junit.Before;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;

import java.util.Properties;
import com.google.inject.Module;

import io.joynr.android.test.TestActivity;
import io.joynr.integration.AbstractSSLEnd2EndTest;
import io.joynr.runtime.JoynrRuntime;

@RunWith(RobolectricTestRunner.class)
@Config(manifest = "./src/test/AndroidManifest.xml")
@@ -18,8 +18,19 @@
*/
package io.joynr.android.robolectric;

import java.util.Properties;

import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;

import com.google.inject.Injector;
import com.google.inject.Module;

import io.joynr.android.test.TestActivity;
import io.joynr.arbitration.ArbitrationStrategy;
import io.joynr.arbitration.DiscoveryQos;
@@ -36,16 +47,6 @@
import joynr.types.ProviderQos;
import joynr.types.ProviderScope;

import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;

import java.util.Properties;

@RunWith(RobolectricTestRunner.class)
@Config(manifest = "./src/test/AndroidManifest.xml")
@Ignore
@@ -18,15 +18,15 @@
*/
package io.joynr.android.test;

import io.joynr.joynrandroidruntime.JoynrAndroidRuntime;
import io.joynr.proxy.ProxyBuilder;

import java.util.Properties;

import android.content.Context;

import com.google.inject.Module;

import io.joynr.joynrandroidruntime.JoynrAndroidRuntime;
import io.joynr.proxy.ProxyBuilder;

public class JoynrAndroidRobolectricRuntime extends JoynrAndroidRuntime {
public JoynrAndroidRobolectricRuntime(Context applicationContext) {
super(applicationContext);
@@ -18,15 +18,15 @@
*/
package io.joynr.android.test;

import io.joynr.joynrandroidruntime.JoynrAndroidRuntime;

import java.util.Properties;

import android.app.Activity;
import android.os.Bundle;

import com.google.inject.Module;

import io.joynr.joynrandroidruntime.JoynrAndroidRuntime;

// An activity that creates Joynr runtimes
public class TestActivity extends Activity {

@@ -26,7 +26,7 @@
<parent>
<groupId>io.joynr</groupId>
<artifactId>android</artifactId>
<version>1.7.1</version>
<version>1.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -21,7 +21,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.joynr.android.test"
android:versionCode="1"
android:versionName="1.7.1">
android:versionName="1.8.0">

<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21"/>

@@ -25,7 +25,7 @@
<parent>
<groupId>io.joynr</groupId>
<artifactId>joynr</artifactId>
<version>1.7.1</version>
<version>1.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<profiles>
Oops, something went wrong.

0 comments on commit b7a92ba

Please sign in to comment.
You can’t perform that action at this time.