From 40e4b2fc7aad57d858e963cc9ab71b77e3ca0574 Mon Sep 17 00:00:00 2001 From: Sekwah Date: Wed, 26 May 2021 02:25:17 +0100 Subject: [PATCH] Removed API module For now the core module will be what is used to communicate with the plugin rather than a specific API package. --- README.md | 8 ++++---- api/build.gradle | 35 ----------------------------------- build.gradle | 1 + core/build.gradle | 10 +++++----- settings.gradle | 1 - 5 files changed, 10 insertions(+), 45 deletions(-) delete mode 100644 api/build.gradle diff --git a/README.md b/README.md index d52494a..afc81af 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,11 @@ An advanced portals plugin for bukkit made by sekwah41 designed to have a wide r **NOTE:** This is the rewrite that is in progress to also allow multiple platforms of server mods, if you are looking for the old version or this version isn't finished check the branch [portals-old](https://github.com/sekwah41/Advanced-Portals/tree/portals-old) # Module Layout -Each implementation will contain the proxy code to allow re-use of the same jar files. -Though due to incompatibilities and keeping the files smaller, we will be making the spigot/paper versions available [here](https://dev.bukkit.org/projects/advanced-portals/files). +We are still planning on how to distribute the files though are planning to make one jar at least run spigot and the proxies. +Originally the API was also supposed to be a separate module though due to possible forge versions and other reasons decided +it would probably be best to not separate it out. ## Common -* **api**: All code for adding tags and creating addons. -* **core**: Functional code with an abstraction layer to create consistent behavior between platforms. +* **core**: Functional code with an abstraction layer to create consistent behavior between platforms as well as making addons. * **lang**: Translations of the plugin available by default. ## Implementations diff --git a/api/build.gradle b/api/build.gradle deleted file mode 100644 index 6dd05a8..0000000 --- a/api/build.gradle +++ /dev/null @@ -1,35 +0,0 @@ - -apply plugin: 'maven-publish' -apply plugin: 'idea' -apply plugin: 'eclipse' -apply plugin: 'java' - -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' -} - -configurations { - // configuration that holds jars to copy into lib - includeLibs -} - -repositories { - maven { url "https://repo.maven.apache.org/maven2" } -} - -// includeLibs just says to include the library in the final jar -dependencies { - -} - -jar { - from configurations.includeLibs.collect { it.isDirectory() ? it : zipTree(it) } -} - -// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task -// if it is present. -// If you remove this task, sources will not be generated. -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} diff --git a/build.gradle b/build.gradle index bb2feaa..ff5bbce 100644 --- a/build.gradle +++ b/build.gradle @@ -63,6 +63,7 @@ repositories { maven { url "https://repo.maven.apache.org/maven2" } maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" } maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } + maven { url "https://nexus.velocitypowered.com/repository/maven-public/" } } // includeLibs just says to include the library in the final jar diff --git a/core/build.gradle b/core/build.gradle index 7a498ca..2a50b5b 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -19,11 +19,11 @@ repositories { // includeLibs just says to include the library in the final jar dependencies { - includeLibs group: 'com.google.code.gson', name: 'gson', version:'2.8.2' - compile group: 'com.google.code.gson', name: 'gson', version:'2.8.2' - includeLibs group: 'com.google.inject', name: 'guice', version:'4.0' - compile group: 'com.google.inject', name: 'guice', version:'4.0' - compile group: 'com.google.guava', name: 'guava', version: '29.0-jre' + includeLibs group: 'com.google.code.gson', name: 'gson', version:'2.8.7' + compile group: 'com.google.code.gson', name: 'gson', version:'2.8.7' + includeLibs group: 'com.google.inject', name: 'guice', version:'5.0.1' + compile group: 'com.google.inject', name: 'guice', version:'5.0.1' + compile group: 'com.google.guava', name: 'guava', version: '30.1.1-jre' } jar { diff --git a/settings.gradle b/settings.gradle index fd148a4..4f9ddb5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,6 @@ rootProject.name = "advanced-portals" // Core modules include 'core' -include 'api' include 'lang' // Implementations