From f9e65babaa17ad04f02b676c3c6f71678ca69666 Mon Sep 17 00:00:00 2001 From: "J. Wu" Date: Mon, 22 May 2023 15:48:16 +0800 Subject: [PATCH 1/5] fix issue#446 --- mantis-common/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mantis-common/build.gradle b/mantis-common/build.gradle index d7e83080b..535f40438 100644 --- a/mantis-common/build.gradle +++ b/mantis-common/build.gradle @@ -30,8 +30,7 @@ dependencies { api "org.xerial.snappy:snappy-java:$snappyVersion" api "org.jctools:jctools-core:$jctoolsVersion" - // spectatorApi should be packaged at entry point level to avoid version conflicts. - compileOnly libraries.spectatorApi + implementation libraries.spectatorApi api libraries.mantisShaded api libraries.rxNettyShaded From e42a3349ed1bd575d635ad576be15f2d6762e874 Mon Sep 17 00:00:00 2001 From: "J. Wu" Date: Thu, 25 May 2023 10:19:04 +0800 Subject: [PATCH 2/5] update --- mantis-common/build.gradle | 3 +-- mantis-runtime/build.gradle | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mantis-common/build.gradle b/mantis-common/build.gradle index 535f40438..0930d649c 100644 --- a/mantis-common/build.gradle +++ b/mantis-common/build.gradle @@ -30,14 +30,13 @@ dependencies { api "org.xerial.snappy:snappy-java:$snappyVersion" api "org.jctools:jctools-core:$jctoolsVersion" - implementation libraries.spectatorApi - api libraries.mantisShaded api libraries.rxNettyShaded api libraries.rxJava api libraries.slf4jApi api libraries.slf4jLog4j12 implementation libraries.commonsIo + implementation libraries.spectatorApi implementation 'net.jcip:jcip-annotations:1.0' testImplementation libraries.spectatorApi diff --git a/mantis-runtime/build.gradle b/mantis-runtime/build.gradle index f66ff3066..6de552fb0 100644 --- a/mantis-runtime/build.gradle +++ b/mantis-runtime/build.gradle @@ -25,7 +25,9 @@ dependencies { api project(':mantis-common') api libraries.slf4jApi compileOnly libraries.jsr305 - compileOnly libraries.spectatorApi + + implementation libraries.spectatorApi + testImplementation libraries.spectatorApi testImplementation libraries.junit4 testImplementation libraries.mockitoCore From f6ebd975c410a4d902699075e5606340aa1437a7 Mon Sep 17 00:00:00 2001 From: "J. Wu" Date: Fri, 26 May 2023 12:03:04 +0800 Subject: [PATCH 3/5] remain compileOnly --- mantis-runtime/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mantis-runtime/build.gradle b/mantis-runtime/build.gradle index 6de552fb0..a3e125dc3 100644 --- a/mantis-runtime/build.gradle +++ b/mantis-runtime/build.gradle @@ -25,8 +25,7 @@ dependencies { api project(':mantis-common') api libraries.slf4jApi compileOnly libraries.jsr305 - - implementation libraries.spectatorApi + compileOnly libraries.spectatorApi testImplementation libraries.spectatorApi testImplementation libraries.junit4 From f12c3de7f4b21687ddf075ed16f580f75e28a47c Mon Sep 17 00:00:00 2001 From: "J. Wu" Date: Sat, 27 May 2023 15:35:25 +0800 Subject: [PATCH 4/5] update spectator dependency --- mantis-common/build.gradle | 4 ++-- mantis-runtime/build.gradle | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mantis-common/build.gradle b/mantis-common/build.gradle index 0930d649c..1ce565aab 100644 --- a/mantis-common/build.gradle +++ b/mantis-common/build.gradle @@ -35,11 +35,11 @@ dependencies { api libraries.rxJava api libraries.slf4jApi api libraries.slf4jLog4j12 + api libraries.spectatorApi implementation libraries.commonsIo - implementation libraries.spectatorApi implementation 'net.jcip:jcip-annotations:1.0' - testImplementation libraries.spectatorApi + testImplementation libraries.commonsLang3 testImplementation "org.hamcrest:hamcrest-core:1.3" testImplementation libraries.junit4 diff --git a/mantis-runtime/build.gradle b/mantis-runtime/build.gradle index a3e125dc3..2f0895460 100644 --- a/mantis-runtime/build.gradle +++ b/mantis-runtime/build.gradle @@ -25,9 +25,8 @@ dependencies { api project(':mantis-common') api libraries.slf4jApi compileOnly libraries.jsr305 - compileOnly libraries.spectatorApi - testImplementation libraries.spectatorApi + testImplementation libraries.junit4 testImplementation libraries.mockitoCore From a32e0ccf26f0a22a6fa35819bba1955fdc765b04 Mon Sep 17 00:00:00 2001 From: "J. Wu" Date: Sun, 28 May 2023 20:20:17 +0800 Subject: [PATCH 5/5] update runtime build.gradle --- mantis-common/build.gradle | 4 ++-- mantis-runtime/build.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mantis-common/build.gradle b/mantis-common/build.gradle index 1ce565aab..37b11f867 100644 --- a/mantis-common/build.gradle +++ b/mantis-common/build.gradle @@ -35,11 +35,11 @@ dependencies { api libraries.rxJava api libraries.slf4jApi api libraries.slf4jLog4j12 - api libraries.spectatorApi + implementation libraries.spectatorApi implementation libraries.commonsIo implementation 'net.jcip:jcip-annotations:1.0' - + testImplementation libraries.spectatorApi testImplementation libraries.commonsLang3 testImplementation "org.hamcrest:hamcrest-core:1.3" testImplementation libraries.junit4 diff --git a/mantis-runtime/build.gradle b/mantis-runtime/build.gradle index 2f0895460..b836028f2 100644 --- a/mantis-runtime/build.gradle +++ b/mantis-runtime/build.gradle @@ -25,8 +25,8 @@ dependencies { api project(':mantis-common') api libraries.slf4jApi compileOnly libraries.jsr305 - - + implementation libraries.spectatorApi + testImplementation libraries.spectatorApi testImplementation libraries.junit4 testImplementation libraries.mockitoCore