Upgrade dependencies and bump version to 0.1.2

SandroHc · Nov 14, 2020 · cfef95d · cfef95d
1 parent ad9384f
commit cfef95d
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ allprojects {
 }
 
 dependencies {
-    implementation 'net.sandrohc:reactive-jikan:0.1.1'
+    implementation 'net.sandrohc:reactive-jikan:0.1.2'
 }
 ```
 
@@ -36,7 +36,7 @@ If using Maven (`pom.xml`):
 <dependency>
     <groupId>net.sandrohc</groupId>
     <artifactId>reactive-jikan</artifactId>
-    <version>0.1.1</version>
+    <version>0.1.2</version>
 </dependency>
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -7,10 +7,12 @@ plugins {
 }
 
 group 'net.sandrohc'
-version '0.1.1'
+version '0.1.2'
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+
     withJavadocJar()
     withSourcesJar()
 }
@@ -36,21 +38,22 @@ repositories {
 
 dependencies {
     // Project Reactor
-    api 'io.projectreactor.netty:reactor-netty:0.9.10.RELEASE'
+    api 'io.projectreactor.netty:reactor-netty:1.0.1'
 
     // Jackson (JSON serializer)
-    api 'com.fasterxml.jackson.core:jackson-databind:2.11.1'
-    api 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1'
+    api 'com.fasterxml.jackson.core:jackson-databind:2.11.3'
+    api 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.3'
 
     // Logging
     api 'org.slf4j:slf4j-api:2.0.0-alpha1'
 
+    // Tests
     testRuntime 'org.slf4j:slf4j-simple:2.0.0-alpha1'
-    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.7.0-M1'
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0-M1'
-    testImplementation 'org.mock-server:mockserver-client-java:5.11.0'
-    testImplementation 'org.mock-server:mockserver-netty:5.11.0'
-    testImplementation 'io.projectreactor:reactor-test:3.3.7.RELEASE'
+    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
+    testImplementation 'org.mock-server:mockserver-client-java:5.11.2'
+    testImplementation 'org.mock-server:mockserver-netty:5.11.2'
+    testImplementation 'io.projectreactor:reactor-test:3.4.0'
 }
 
 test {

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sun Jul 12 21:50:59 BST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

diff --git a/gradlew.bat b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

diff --git a/src/test/java/net/sandrohc/jikan/test/MockUtils.java b/src/test/java/net/sandrohc/jikan/test/MockUtils.java
@@ -23,7 +23,6 @@ public static ClientAndServer createMockServer() {
 	}
 
 	public static void mock(ClientAndServer mockServer, String uri, String json, Parameter... queryParameters) {
-		mockServer.clear(null);
 		mockServer
 				.when(request().withMethod("GET").withPath(uri).withQueryStringParameters(queryParameters))
 				.respond(response()
@@ -41,7 +40,6 @@ public static void mockError(ClientAndServer mockServer, HttpResponseStatus stat
 				" \"type\": \"ErrorException\"" +
 				" }";
 
-		mockServer.clear(null);
 		mockServer
 				.when(request())
 				.respond(response()

diff --git a/src/test/java/net/sandrohc/jikan/test/RequestTest.java b/src/test/java/net/sandrohc/jikan/test/RequestTest.java
@@ -13,13 +13,14 @@ public class RequestTest {
 
 	@BeforeAll
 	public static void setup() {
-		mockServer = MockUtils.createMockServer();
 		jikan = new JikanBuilder().debug(true).baseUrl(MockUtils.MOCK_URL).maxRetries(1).userAgent("reactive-jikan/unit-tests").build();
+		if (mockServer == null)
+			mockServer = MockUtils.createMockServer();
 	}
 
-	@AfterAll
-	public static void stopServer() {
-		mockServer.stop();
+	@BeforeEach
+	public void stopServer() {
+		mockServer.reset();
 	}
 
 }