Skip to content

Declare api and implementation dependencies to align with code usages #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-susanh merged 7 commits into from
Sep 18, 2020
Merged

Declare api and implementation dependencies to align with code usages #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
74dea99
Add dependencies that had been leaking out of api
labkey-susanh Aug 30, 2020
bd886e5
Merge remote-tracking branch 'origin/develop' into fb_dependencyHealth
labkey-susanh Sep 7, 2020
0891374
Remove commons-math3 from :server:modules:platform:api
labkey-susanh Sep 7, 2020
2f7f593
Remove dependency from jspImplementation to deprecated compile config…
labkey-susanh Sep 7, 2020
b251fbe
Merge remote-tracking branch 'origin/develop' into fb_dependencyHealth
labkey-susanh Sep 12, 2020
65429bd
Merge remote-tracking branch 'origin/develop' into fb_dependencyHealth
labkey-susanh Sep 17, 2020
7740a63
Align jars.txt with dependency declarations
labkey-susanh Sep 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions elisa/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import org.labkey.gradle.util.BuildUtils

dependencies {
external "org.apache.commons:commons-math3:${commonsMath3Version}"
}

BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "assay"), depProjectConfig: "apiJarFile")

BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "assay"), depProjectConfig: "published", depExtension: "module")
Expand Down
4 changes: 4 additions & 0 deletions elisa/resources/credits/jars.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{table}
Filename|Component|Version|Source|License|LabKey Dev|Purpose
commons-math3-3.6.1.jar|Commons Math|3.6.1|{link:Apache|http://commons.apache.org/math/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|klum|Lightweight, self-contained mathematics and statistics components
{table}
1 change: 0 additions & 1 deletion flow/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ dependencies {
implementation sourceSets.engine.output
jspImplementation sourceSets.engine.output
jspImplementation project.files(project.tasks.schemasCompile)
BuildUtils.addLabKeyDependency(project: project, config: "jspImplementation", depProjectPath: project.path, depProjectConfig: 'compile')
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "assay"), depProjectConfig: "apiJarFile")
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "experiment"), depProjectConfig: "published", depExtension: "module")
BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "query"), depProjectConfig: "published", depExtension: "module")
Expand Down
2 changes: 2 additions & 0 deletions ms2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import org.labkey.gradle.util.BuildUtils

dependencies {
external("org.apache.httpcomponents:httpmime:${httpmimeVersion}")
external("org.ardverk:patricia-trie:${patriciaTrieVersion}")
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "assay"), depProjectConfig: "apiJarFile")

BuildUtils.addLabKeyDependency(project: project, config: "modules", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "experiment"), depProjectConfig: "published", depExtension: "module")
Expand Down
5 changes: 5 additions & 0 deletions ms2/resources/credits/jars.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{table}
Filename|Component|Version|Source|License|LabKey Dev|Purpose
httpmime-4.5.3.jar|Apache HTTP Mime|4.5.3|{link:Apache|http://hc.apache.org/httpcomponents-client-ga}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|adam|HTTP client for requests of remote servers
patricia-trie-0.6.jar|PATRICIA Trie|0.6|{link:PATRICIA Trie|http://code.google.com/p/patricia-trie/}|{link:Apache 2.0|http://www.apache.org/licenses/LICENSE-2.0}|jeckels|PATRICIA Trie data structure implementation
{table}