From 7227dd1288ddce441efc5ffdcd15dd91d10787c1 Mon Sep 17 00:00:00 2001 From: nietsnie Date: Thu, 1 Feb 2018 08:34:08 +0100 Subject: [PATCH 1/3] Fixing collision with netflix-core library. --- .../spring/boot/rxjava/config/RxJavaMvcAutoConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/jmnarloch/spring/boot/rxjava/config/RxJavaMvcAutoConfiguration.java b/src/main/java/io/jmnarloch/spring/boot/rxjava/config/RxJavaMvcAutoConfiguration.java index 849b6a5..98c8625 100644 --- a/src/main/java/io/jmnarloch/spring/boot/rxjava/config/RxJavaMvcAutoConfiguration.java +++ b/src/main/java/io/jmnarloch/spring/boot/rxjava/config/RxJavaMvcAutoConfiguration.java @@ -46,7 +46,7 @@ public class RxJavaMvcAutoConfiguration { @RxJava @ConditionalOnMissingBean @ConditionalOnClass(Observable.class) - public ObservableReturnValueHandler observableReturnValueHandler() { + public ObservableReturnValueHandler rx2observableReturnValueHandler() { return new ObservableReturnValueHandler(); } @@ -54,7 +54,7 @@ public ObservableReturnValueHandler observableReturnValueHandler() { @RxJava @ConditionalOnMissingBean @ConditionalOnClass(Single.class) - public SingleReturnValueHandler singleReturnValueHandler() { + public SingleReturnValueHandler rx2singleReturnValueHandler() { return new SingleReturnValueHandler(); } From 693be212f3309569f993897943cbbc0be849e006 Mon Sep 17 00:00:00 2001 From: Kamil Manka Date: Sun, 29 Jul 2018 19:58:55 +0200 Subject: [PATCH 2/3] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d4d5d8a..a58d156 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ #Sun, 27 Nov 2016 18:29:36 -0800 -version=2.0.1-SNAPSHOT +version=2.0.1 From 24ad971b775d2a8bec64000c2558dae38e768b08 Mon Sep 17 00:00:00 2001 From: Kamil Manka Date: Sun, 29 Jul 2018 20:00:53 +0200 Subject: [PATCH 3/3] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5f7b3b1..8e04b92 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.github.kt3k.coveralls' sourceCompatibility = 1.7 -group = "io.jmnarloch" +group = "com.github.ikamman" archivesBaseName="rxjava-spring-boot-starter" ext {