diff --git a/.gitignore b/.gitignore index 0dc966d62cd..18c9d5bfff6 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,8 @@ snap/.snapcraft/ ui/ # IntelliJ IDEA -.idea/ +.idea/* +!.idea/runConfigurations/ *.ipr *.iml diff --git a/.idea/runConfigurations/JabRef_Main.xml b/.idea/runConfigurations/JabRef_Main.xml new file mode 100644 index 00000000000..780974d6408 --- /dev/null +++ b/.idea/runConfigurations/JabRef_Main.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 34a396dce45..04ea37d1ef7 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ plugins { id 'com.github.johnrengelman.shadow' version '5.1.0' id "com.simonharrer.modernizer" version '1.8.0-1' id 'me.champeau.gradle.jmh' version '0.4.8' - id 'net.ltgt.errorprone' version '0.8.1' + //id 'net.ltgt.errorprone' version '0.8.1' id 'com.github.ben-manes.versions' version '0.22.0' id 'org.javamodularity.moduleplugin' version '1.5.0' id 'org.openjfx.javafxplugin' version '0.0.8' @@ -99,7 +99,7 @@ repositories { } configurations { - errorprone + //errorprone libreoffice // TODO: Remove the following workaround for split error messages such as @@ -185,9 +185,20 @@ dependencies { compile group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '2.3.2' compile group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.2' - compile 'com.github.tomtung:latex2unicode_2.12:0.2.6' + compile ('com.github.tomtung:latex2unicode_2.12:0.2.6') { + exclude module: 'fastparse_2.12' + } - errorprone 'com.google.errorprone:error_prone_core:2.3.2' + /* + TODO: Reenable error prone as soon as https://github.com/google/error-prone/issues/1210 is fixed + errorprone ('com.google.errorprone:error_prone_core:2.3.2') { + exclude module: "jsr305" + exclude group: 'org.checkerframework', module: 'checker-qual' + exclude group: 'com.google.errorprone', module: 'error_prone_annotation' + exclude group: 'com.google.errorprone', module: 'error_prone_annotations' + exclude group: 'com.google.errorprone', module: 'error_prone_check_api' + } + */ compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.4.1' compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.4.1'