Skip to content
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.

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

Include Maven compile scope dependencies in Gradle JAR #766

Merged
merged 1 commit into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 9 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
* for building archives (such as an APK), but is useful for performing Android checks like lint.
*/
if (!project.hasProperty("android")) {
apply plugin: 'java'
apply plugin: 'java-library'
apply plugin: 'checkstyle'
apply plugin: 'jacoco'
apply plugin: 'me.champeau.jmh'
Expand Down Expand Up @@ -144,20 +144,18 @@ if (!project.hasProperty("android")) {

dependencies {
// Be sure to update dependencies in pom.xml to match
implementation 'joda-time:joda-time:2.10.13'
implementation 'org.slf4j:slf4j-api:1.7.33'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.1'
api 'joda-time:joda-time:2.10.13'
api 'org.slf4j:slf4j-api:1.7.33'
api 'com.fasterxml.jackson.core:jackson-databind:2.13.1'
api 'org.jetbrains.kotlin:kotlin-stdlib:1.6.10'
api 'org.bouncycastle:bcprov-jdk18on:1.77'
api 'net.sf.kxml:kxml2:2.3.0'

// Upgrade to version higher than 1.4 when Collect minSDK >= 26
implementation 'org.apache.commons:commons-csv:1.4'
api 'org.apache.commons:commons-csv:1.4'

// Upgrade to version higher than 2.5 when Collect minSDK >= 26
implementation 'commons-io:commons-io:2.5'

implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.6.10'
implementation 'org.bouncycastle:bcprov-jdk18on:1.77'

compileOnly 'net.sf.kxml:kxml2:2.3.0'
api 'commons-io:commons-io:2.5'

testImplementation 'ch.qos.logback:logback-classic:1.2.10'
testImplementation 'junit:junit:4.13.2'
Expand Down
2 changes: 0 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,11 @@
<groupId>net.sf.kxml</groupId>
<artifactId>kxml2</artifactId>
<version>2.3.0</version>
<scope>compile</scope>
Copy link
Member Author

@seadowg seadowg Jun 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was probably confusing things: compile is the default and doesn't need to be specified.

https://stackoverflow.com/questions/6646959/difference-between-maven-scope-compile-and-provided-for-jar-packaging

</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.10.13</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down