diff --git a/core/build.gradle b/core/build.gradle index 29e215a..05828c3 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -2,14 +2,21 @@ apply plugin: 'java' -sourceCompatibility = 1.7 +//sourceCompatibility = 1.8 +java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.targetCompatibility = JavaVersion.VERSION_1_8 + +repositories { + mavenCentral() + google() +} dependencies { - testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.3.0' - testImplementation 'commons-io:commons-io:2.4' - testImplementation 'junit:junit:4.11' + testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.17.0' + testImplementation 'commons-io:commons-io:2.7' + testImplementation 'junit:junit:4.13.2' testImplementation 'org.hamcrest:hamcrest-library:1.3' - testImplementation 'org.mockito:mockito-core:1.9.5' + testImplementation 'org.mockito:mockito-core:5.3.1' } jar { diff --git a/core/src/test/java/io/keen/client/java/KeenClientTest.java b/core/src/test/java/io/keen/client/java/KeenClientTest.java index e905a70..51ac1bb 100755 --- a/core/src/test/java/io/keen/client/java/KeenClientTest.java +++ b/core/src/test/java/io/keen/client/java/KeenClientTest.java @@ -6,11 +6,9 @@ import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.mockito.ArgumentCaptor; -import java.awt.*; import java.io.IOException; import java.util.ArrayList; import java.util.Calendar; @@ -34,7 +32,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/gradle/gradle-mvn-publish-java.gradle b/gradle/gradle-mvn-publish-java.gradle index 533f18a..57a9228 100644 --- a/gradle/gradle-mvn-publish-java.gradle +++ b/gradle/gradle-mvn-publish-java.gradle @@ -1,10 +1,10 @@ task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' + archiveClassifier = 'javadoc' from javadoc.destinationDir } task sourcesJar(type: Jar) { - classifier = 'sources' + archiveClassifier = 'sources' from sourceSets.main.allSource } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d913..17655d0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists