diff --git a/api/build.gradle b/api/build.gradle deleted file mode 100644 index 2e9ad263..00000000 --- a/api/build.gradle +++ /dev/null @@ -1,34 +0,0 @@ -dependencies { - implementation project(path: ':bukkit') - compileOnly project(path: ':common') - - compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT' - compileOnly 'org.jetbrains:annotations:23.0.0' -} - -shadowJar { - dependencies { - exclude(dependency('com.mojang:brigadier')) - } - - relocate 'org.apache', 'net.william278.husksync.libraries' - relocate 'dev.dejvokep', 'net.william278.husksync.libraries' - relocate 'de.themoep', 'net.william278.husksync.libraries' - relocate 'org.jetbrains', 'net.william278.husksync.libraries' - relocate 'org.intellij', 'net.william278.husksync.libraries' - relocate 'com.zaxxer', 'net.william278.husksync.libraries' - relocate 'com.google', 'net.william278.husksync.libraries' - relocate 'redis.clients', 'net.william278.husksync.libraries' - relocate 'org.json', 'net.william278.husksync.libraries.json' - relocate 'me.lucko.commodore', 'net.william278.husksync.libraries.commodore' - - relocate 'net.byteflux.libby', 'net.william278.husksync.libraries.libby' - relocate 'org.bstats', 'net.william278.husksync.libraries.bstats' - relocate 'net.william278.mpdbconverter', 'net.william278.husksync.libraries.mpdbconverter' - relocate 'net.william278.hslmigrator', 'net.william278.husksync.libraries.hslconverter' -} - -java { - withSourcesJar() - withJavadocJar() -} \ No newline at end of file diff --git a/build.gradle b/build.gradle index ce3b2ea7..275edfa9 100644 --- a/build.gradle +++ b/build.gradle @@ -56,14 +56,14 @@ subprojects { version rootProject.version archivesBaseName = "${rootProject.name}-${project.name.capitalize()}" - if (['bukkit', 'api', 'plugin'].contains(project.name)) { + if (['bukkit', 'plugin'].contains(project.name)) { shadowJar { destinationDirectory.set(file("$rootDir/target")) archiveClassifier.set('') } // API publishing - if ('api'.contains(project.name)) { + if ('bukkit'.contains(project.name)) { java { withSourcesJar() withJavadocJar() diff --git a/api/src/main/java/net/william278/husksync/api/HuskSyncAPI.java b/bukkit/src/main/java/net/william278/husksync/api/HuskSyncAPI.java similarity index 100% rename from api/src/main/java/net/william278/husksync/api/HuskSyncAPI.java rename to bukkit/src/main/java/net/william278/husksync/api/HuskSyncAPI.java diff --git a/plugin/build.gradle b/plugin/build.gradle index e121c5b2..32b9327e 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -1,6 +1,5 @@ dependencies { implementation project(path: ':bukkit', configuration: 'shadow') - implementation project(path: ':api', configuration: 'shadow') } shadowJar { diff --git a/settings.gradle b/settings.gradle index 914df6f3..c0e4840c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,5 +8,4 @@ rootProject.name = 'HuskSync' include 'common' include 'bukkit' -include 'api' include 'plugin' \ No newline at end of file