Skip to content

Commit 66b7fe3

Browse files
authored
Merge pull request #5249 from JabRef/intellj
Make it easier to compile with intellj
2 parents 84436d7 + 9e2bed0 commit 66b7fe3

File tree

3 files changed

+30
-5
lines changed

3 files changed

+30
-5
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ snap/.snapcraft/
2323
ui/
2424

2525
# IntelliJ IDEA
26-
.idea/
26+
.idea/*
27+
!.idea/runConfigurations/
2728
*.ipr
2829
*.iml
2930

.idea/runConfigurations/JabRef_Main.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ plugins {
2525
id 'com.github.johnrengelman.shadow' version '5.1.0'
2626
id "com.simonharrer.modernizer" version '1.8.0-1'
2727
id 'me.champeau.gradle.jmh' version '0.4.8'
28-
id 'net.ltgt.errorprone' version '0.8.1'
28+
//id 'net.ltgt.errorprone' version '0.8.1'
2929
id 'com.github.ben-manes.versions' version '0.22.0'
3030
id 'org.javamodularity.moduleplugin' version '1.5.0'
3131
id 'org.openjfx.javafxplugin' version '0.0.8'
@@ -99,7 +99,7 @@ repositories {
9999
}
100100

101101
configurations {
102-
errorprone
102+
//errorprone
103103
libreoffice
104104

105105
// TODO: Remove the following workaround for split error messages such as
@@ -185,9 +185,20 @@ dependencies {
185185
compile group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '2.3.2'
186186
compile group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.2'
187187

188-
compile 'com.github.tomtung:latex2unicode_2.12:0.2.6'
188+
compile ('com.github.tomtung:latex2unicode_2.12:0.2.6') {
189+
exclude module: 'fastparse_2.12'
190+
}
189191

190-
errorprone 'com.google.errorprone:error_prone_core:2.3.2'
192+
/*
193+
TODO: Reenable error prone as soon as https://github.com/google/error-prone/issues/1210 is fixed
194+
errorprone ('com.google.errorprone:error_prone_core:2.3.2') {
195+
exclude module: "jsr305"
196+
exclude group: 'org.checkerframework', module: 'checker-qual'
197+
exclude group: 'com.google.errorprone', module: 'error_prone_annotation'
198+
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
199+
exclude group: 'com.google.errorprone', module: 'error_prone_check_api'
200+
}
201+
*/
191202

192203
compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.4.1'
193204
compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.4.1'

0 commit comments

Comments
 (0)