Skip to content

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

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 6 commits into from
Sep 18, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f87b968
Remove commons-math3 from :server:modules:platform:api
labkey-susanh Sep 7, 2020
48a657a
Use jetbrains Nullable instead of javax.annotation
labkey-susanh Sep 8, 2020
197f352
Align jars.txt with dependency declarations
labkey-susanh Sep 17, 2020
84623b6
Merge remote-tracking branch 'origin/develop' into fb_dependencyHealth
labkey-susanh Sep 18, 2020
273b1d8
Remove duplicate tomorrow
labkey-susanh Sep 18, 2020
90cbb9e
Merge remote-tracking branch 'origin/develop' into fb_dependencyHealth
labkey-susanh Sep 18, 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
1 change: 1 addition & 0 deletions Viral_Load_Assay/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import org.labkey.gradle.util.BuildUtils;

dependencies {
external "org.apache.commons:commons-math3:${commonsMath3Version}"
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "apiJarFile")
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:laboratory", depProjectConfig: "apiJarFile")
}
4 changes: 4 additions & 0 deletions Viral_Load_Assay/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|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}|Lightweight, self-contained mathematics and statistics components
{table}
5 changes: 3 additions & 2 deletions ehr/api-src/org/labkey/api/ehr/dataentry/DefaultDataEntryFormFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.labkey.api.module.Module;

import javax.annotation.Nullable;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
Expand All @@ -42,7 +42,8 @@ public DefaultDataEntryFormFactory(@NotNull Class<? extends DataEntryForm> clazz
_module = module;
}

@Nullable @Override
@Nullable
@Override
public DataEntryForm createForm(DataEntryFormContext ctx)
{
try
Expand Down