diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index e504933df816a4dfacb513d47d02ba31a77efb83..cea06e787a486d3b6a3bf036a4712a2640f1d357 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=10 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=10 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -127,7 +127,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=10 +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0 diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 6ec462bfe8e9a5dd980c33893c28357c6c0a43d3..b7ed64cd92cce04175f3150d344f07574a7cd0c3 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -1,4 +1,4 @@ -image: openjdk:10.0.2-13-jre-sid +image: openjdk:11-jre-slim pipelines: default: diff --git a/build.gradle b/build.gradle index de7f966f8a83ebfbdee0c10e6ed5791e1f0f696d..968ceb9550c6469f1f782218812045c74f55ceb4 100644 --- a/build.gradle +++ b/build.gradle @@ -3,8 +3,8 @@ apply plugin: 'eclipse' defaultTasks('zip') -sourceCompatibility = JavaVersion.VERSION_1_10 -targetCompatibility = JavaVersion.VERSION_1_10 +sourceCompatibility = JavaVersion.VERSION_11 +targetCompatibility = JavaVersion.VERSION_11 sourceSets { mainSource { @@ -27,7 +27,7 @@ dependencies { compile files('../L2J_Server/dist/libs/mmocore.jar') compile project(':L2J_Server') testCompile 'org.testng:testng:6.14.3' - testCompile 'org.mockito:mockito-core:2.20.1' + testCompile 'org.mockito:mockito-core:2.23.4' } task zip(type: Zip) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a95009c3b9edbe318f3510f6dd72e37ef7966af9..558870dad58374b15da05b30d79fbb07cc2bed9e 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-4.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists