Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2024-11-26 12:35:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update h2, remove lombok and include the rest of the subprojects in i18n again

Browse Source
This commit is contained in:
Vankka 2022-01-13 18:57:26 +02:00
parent 0c7783675d
commit 047580d9cf
No known key found for this signature in database
GPG Key ID: 6E50CB7A29B96AD0
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle
View File

@ -1,7 +1,6 @@
plugins {
id 'com.github.johnrengelman.shadow' version '7.1.1' apply false
id 'org.cadixdev.licenser' version '0.6.0' apply false
id 'io.freefair.lombok' version '5.3.3.3' apply false
id 'net.kyori.blossom' version '1.2.0' apply false
id 'dev.vankka.dependencydownload.plugin' version '1.0.3-SNAPSHOT' apply false
}
@ -28,13 +27,10 @@ allprojects {
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'org.cadixdev.licenser'
apply plugin: 'dev.vankka.dependencydownload.plugin'
apply plugin: 'io.freefair.lombok'
group 'com.discordsrv'
version = rootProject.version
generateLombokConfig.enabled = false
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
@ -59,13 +55,12 @@ allprojects {
mavenCentral()
maven { url 'https://nexus.scarsz.me/content/groups/public/' }
//maven { url 'https://m2.dv8tion.net/releases/' }
}
dependencies {
// Test dependencies
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
}
test {
@ -77,6 +72,7 @@ allprojects {
}
clean.dependsOn deleteJarsDir
defaultTasks 'build'
jar {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
@ -113,7 +109,7 @@ allprojects {
header = rootProject.file('buildscript/license/LICENSE_HEADER')
properties {
var inception = '2016'
var currentYear = String.valueOf(Calendar.getInstance().get(Calendar.YEAR))
var currentYear = String.valueOf(Calendar.getInstance().get(Calendar.YEAR)-1)
year = inception == currentYear ? currentYear : inception + '-' + currentYear
}

2
common/build.gradle
View File

@ -53,7 +53,7 @@ dependencies {
runtimeDownloadApi 'dev.vankka:enhancedlegacytext:1.0.0-SNAPSHOT'
// Database Drivers
h2Driver 'com.h2database:h2:1.4.200'
h2Driver 'com.h2database:h2:2.0.204'
mysqlDriver 'mysql:mysql-connector-java:8.0.25'
// Integrations

6
i18n/build.gradle
View File

@ -17,9 +17,9 @@ dependencies {
// Depend on all platforms for configs
implementation(project(':bukkit')) { transitive = false }
//implementation(project(':bungee')) { transitive = false }
//implementation(project(':sponge')) { transitive = false }
//implementation(project(':velocity')) { transitive = false }
implementation(project(':bungee')) { transitive = false }
implementation(project(':sponge')) { transitive = false }
implementation(project(':velocity')) { transitive = false }
api 'org.spongepowered:configurate-yaml:' + rootProject.configurateVersion
api 'org.spongepowered:configurate-hocon:' + rootProject.configurateVersion