From a6df788f4f88552a41da83020f45f41f3452dd3b 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. --- api/build.gradle | 35 ----------------------------------- core/build.gradle | 10 +++++----- settings.gradle | 1 - 3 files changed, 5 insertions(+), 41 deletions(-) delete mode 100644 api/build.gradle diff --git a/api/build.gradle b/api/build.gradle deleted file mode 100644 index 6dd05a8d..00000000 --- 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/core/build.gradle b/core/build.gradle index 7a498ca6..2a50b5b1 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 fd148a49..4f9ddb52 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,6 @@ rootProject.name = "advanced-portals" // Core modules include 'core' -include 'api' include 'lang' // Implementations