Updated dependencies and gradle
This commit is contained in:
parent
3cb83465d1
commit
bcab33c12c
|
@ -17,7 +17,7 @@ applyRootArtifactoryConfig()
|
||||||
if (!project.hasProperty("gitCommitHash")) {
|
if (!project.hasProperty("gitCommitHash")) {
|
||||||
apply(plugin = "org.ajoberstar.grgit")
|
apply(plugin = "org.ajoberstar.grgit")
|
||||||
ext["gitCommitHash"] = try {
|
ext["gitCommitHash"] = try {
|
||||||
(ext["grgit"] as Grgit?)?.head()?.abbreviatedId
|
Grgit.open(mapOf("currentDir" to project.rootDir))?.head()?.abbreviatedId
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
logger.warn("Error getting commit hash", e)
|
logger.warn("Error getting commit hash", e)
|
||||||
|
|
||||||
|
|
|
@ -11,9 +11,9 @@ repositories {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(gradleApi())
|
implementation(gradleApi())
|
||||||
implementation("gradle.plugin.net.minecrell:licenser:0.4.1")
|
implementation("gradle.plugin.net.minecrell:licenser:0.4.1")
|
||||||
implementation("org.ajoberstar.grgit:grgit-gradle:3.1.1")
|
implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0")
|
||||||
implementation("com.github.jengelman.gradle.plugins:shadow:5.1.0")
|
implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
|
||||||
implementation("net.ltgt.apt-eclipse:net.ltgt.apt-eclipse.gradle.plugin:0.21")
|
implementation("net.ltgt.apt-eclipse:net.ltgt.apt-eclipse.gradle.plugin:0.21")
|
||||||
implementation("net.ltgt.apt-idea:net.ltgt.apt-idea.gradle.plugin:0.21")
|
implementation("net.ltgt.apt-idea:net.ltgt.apt-idea.gradle.plugin:0.21")
|
||||||
implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.9.7")
|
implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.21.0")
|
||||||
}
|
}
|
|
@ -31,8 +31,8 @@ fun Project.applyPlatformAndCoreConfiguration() {
|
||||||
ext["internalVersion"] = "$version+${rootProject.ext["gitCommitHash"]}"
|
ext["internalVersion"] = "$version+${rootProject.ext["gitCommitHash"]}"
|
||||||
|
|
||||||
configure<JavaPluginConvention> {
|
configure<JavaPluginConvention> {
|
||||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
sourceCompatibility = JavaVersion.VERSION_11
|
||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
targetCompatibility = JavaVersion.VERSION_11
|
||||||
}
|
}
|
||||||
|
|
||||||
configure<CheckstyleExtension> {
|
configure<CheckstyleExtension> {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
object Versions {
|
object Versions {
|
||||||
// const val PISTON = "0.4.3"
|
// const val PISTON = "0.4.3"
|
||||||
// const val AUTO_VALUE = "1.6.5"
|
// const val AUTO_VALUE = "1.6.5"
|
||||||
const val WORLDEDIT = "7.2.0-SNAPSHOT"
|
const val WORLDEDIT = "7.2.6-SNAPSHOT"
|
||||||
const val JUNIT = "4.11"
|
const val JUNIT = "4.11"
|
||||||
const val SQUIRRELID = "0.2.0"
|
const val SQUIRRELID = "0.2.0"
|
||||||
const val GUAVA = "21.0"
|
const val GUAVA = "21.0"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
|
@ -10,7 +10,7 @@ dependencies {
|
||||||
"api"(project(":worldguard-libs:core"))
|
"api"(project(":worldguard-libs:core"))
|
||||||
"api"("com.sk89q.worldedit:worldedit-core:${Versions.WORLDEDIT}")
|
"api"("com.sk89q.worldedit:worldedit-core:${Versions.WORLDEDIT}")
|
||||||
"implementation"("org.flywaydb:flyway-core:3.0")
|
"implementation"("org.flywaydb:flyway-core:3.0")
|
||||||
"implementation"("org.yaml:snakeyaml:1.9")
|
"implementation"("org.yaml:snakeyaml:1.29")
|
||||||
"implementation"("com.google.guava:guava:${Versions.GUAVA}")
|
"implementation"("com.google.guava:guava:${Versions.GUAVA}")
|
||||||
|
|
||||||
"compileOnly"("com.google.code.findbugs:jsr305:1.3.9")
|
"compileOnly"("com.google.code.findbugs:jsr305:1.3.9")
|
||||||
|
|
Loading…
Reference in New Issue