Updates to build sucessfully - breaking changes in Firebase and SendGrid
This commit is contained in:
27
build.gradle
27
build.gradle
@@ -49,8 +49,8 @@ def dockerImageTag = "${dockerImageName}:${mxidsVersion()}"
|
||||
|
||||
group = 'io.kamax'
|
||||
mainClassName = 'io.kamax.mxisd.MxisdStandaloneExec'
|
||||
sourceCompatibility = '1.8'
|
||||
targetCompatibility = '1.8'
|
||||
sourceCompatibility = '11'
|
||||
targetCompatibility = '11'
|
||||
|
||||
String mxidsVersion() {
|
||||
def versionPattern = Pattern.compile("v(\\d+\\.)?(\\d+\\.)?(\\d+)(-.*)?")
|
||||
@@ -75,6 +75,7 @@ buildscript {
|
||||
repositories {
|
||||
gradlePluginPortal()
|
||||
mavenCentral()
|
||||
google()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@@ -95,7 +96,7 @@ dependencies {
|
||||
api 'commons-io:commons-io:2.15.1'
|
||||
|
||||
// Config management
|
||||
api 'org.yaml:snakeyaml:2.2'
|
||||
api 'org.yaml:snakeyaml:1.33'
|
||||
|
||||
// Dependencies from old Matrix-java-sdk
|
||||
api 'org.apache.commons:commons-lang3:3.14.0'
|
||||
@@ -160,7 +161,7 @@ dependencies {
|
||||
testImplementation 'junit:junit:4.13.2'
|
||||
testImplementation 'com.github.tomakehurst:wiremock:3.0.1'
|
||||
testImplementation 'com.unboundid:unboundid-ldapsdk:7.0.0'
|
||||
testImplementation 'com.icegreen:greenmail:2.0.1'
|
||||
testImplementation 'com.icegreen:greenmail:1.6.15'
|
||||
}
|
||||
|
||||
jar {
|
||||
@@ -308,3 +309,21 @@ task dockerPushX(type: Exec) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tasks.named('assemble').configure {
|
||||
dependsOn shadowJar
|
||||
}
|
||||
|
||||
tasks.withType(AbstractArchiveTask) {
|
||||
if (it.name == 'distZip' || it.name == 'distTar') {
|
||||
dependsOn shadowJar
|
||||
}
|
||||
}
|
||||
|
||||
tasks.named('startScripts').configure {
|
||||
mustRunAfter shadowJar
|
||||
}
|
||||
|
||||
tasks.named('startShadowScripts').configure {
|
||||
dependsOn jar
|
||||
}
|
||||
|
Reference in New Issue
Block a user