Skip to content

Commit

Permalink
Revert "[RFE#1714] chore: build languagetool as modules (omegat-org#741
Browse files Browse the repository at this point in the history
…)"

This reverts commit 7a3a77f.

There is a report that modularize of langaugetool does not work.
  • Loading branch information
miurahr committed Oct 7, 2023
1 parent ac1b0d2 commit 50339b1
Show file tree
Hide file tree
Showing 32 changed files with 14 additions and 1,089 deletions.
22 changes: 14 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,12 @@ dependencies {
exclude module: 'guava'
}

runtimeOnly(libs.languagetool.all) {
// Temporary exclusion; see https://sourceforge.net/p/omegat/bugs/814/
exclude module: 'lucene-gosen'
}
runtimeOnly 'org.omegat.lucene:lucene-gosen:5.5.1:ipadic'

// Lucene for tokenizers
implementation(libs.bundles.lucene)

Expand Down Expand Up @@ -535,9 +541,11 @@ distributions {
into 'lib'
}
// system core plugins into modules
into('modules') {
from(subprojects.collect {it.tasks.withType(Jar)})
from('releases/modules-specific')
from('releases/modules-specific') {
into 'modules'
}
from(subprojects.collect {it.tasks.withType(Jar)}) {
into 'modules'
}
eachFile {
// Move main JAR up one level from lib.
Expand Down Expand Up @@ -566,12 +574,10 @@ distributions {
into('lib/provided') {
// collect project runtime dependencies in all subprojects and sourceSets
from configurations.runtimeClasspath
from {subprojects.findAll { it.getSubprojects().isEmpty()}.collect {
// catch languatools.*RuntimeClasspath, which * is language code,
// and normal runtimeClasspath but no testRuntimeClasspath and jaxbRuntimeClasspath
it.configurations.matching { it.name.endsWith('untimeClasspath')
from {subprojects.findAll { it.getSubprojects().isEmpty()}
.collect { it.configurations.matching { it.name.endsWith('untimeClasspath')
&& !it.name.startsWith('test') && !it.name.startsWith('jaxb')
}}
} }
}
}
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 50339b1

Please sign in to comment.