From f7bf5f273a7caddfb99347d0236e98985d82b2b6 Mon Sep 17 00:00:00 2001
From: Callum Stott <callum@seadowg.com>
Date: Mon, 3 Jun 2024 16:53:29 +0100
Subject: [PATCH] Include Maven compile scope dependencies in Gradle JAR (#766)

---
 build.gradle | 20 +++++++++-----------
 pom.xml      |  2 --
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7c450c724..869719baf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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'
@@ -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'
diff --git a/pom.xml b/pom.xml
index e3e5dc8f2..a29c266a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,13 +48,11 @@
       <groupId>net.sf.kxml</groupId>
       <artifactId>kxml2</artifactId>
       <version>2.3.0</version>
-      <scope>compile</scope>
     </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>