Re-organising structure

.versionrc.js

@@ -18,11 +18,25 @@ const bungee = {
   ...ymlUpdater,
 }
 
-const plugin = {
-  filename: 'src/main/resources/plugin.yml',
+const spigotPlugin = {
+  filename: 'spigot/src/main/resources/plugin.yml',
   ...ymlUpdater,
 }
 
+
+const gradleTracker = {
+  filename: 'gradle.properties',
+  updater: {
+    'readVersion': (contents) => {
+      return versionRegex.exec(contents)[2];
+    },
+    'writeVersion': (contents, version) => {
+      return contents.replace(versionRegex, `$1${version}`);
+    }
+  }
+}
+
+
 const velocity_plugin = {
   filename: 'src/main/java/com/sekwah/advancedportals/velocity/AdvancedPortalsPlugin.java',
   updater: {
@@ -35,7 +49,7 @@ const velocity_plugin = {
   }
 }
 
-const files = [plugin, velocity_plugin, bungee];
+const files = [gradleTracker] // spigotPlugin, velocity_plugin, bungee
 
 module.exports = {
   bumpFiles: files,

README.md

@@ -89,6 +89,4 @@ We don't currently do tests. But in case.
 -->
 
 ## Scopes available
-Scopes are only needed if relating to specific features just to make them easier to find.
-_I'll expand the list as I work more on the project._
-* **proxy** (Proxy specific features and issues)
+The scopes available should be the specific modules being worked on. E.g. core, spigot, docs

api/build.gradle

@@ -0,0 +1,35 @@
+
+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
+}

build.gradle

@@ -51,14 +51,13 @@ if (branch != null) {
 }
 def isCanary = version.toString().contains('canary')
 
-apply plugin: 'maven-publish'
-apply plugin: 'idea'
-apply plugin: 'eclipse'
 
-// A little messier/not advised but
 allprojects {
     apply plugin: 'java'
 
+    tasks.withType(JavaCompile) {
+        options.encoding = 'UTF-8'
+    }
 
     sourceCompatibility = 1.8
     targetCompatibility = 1.8

bungee/src/build.gradle

@@ -1,4 +1,9 @@
 
+apply plugin: 'maven-publish'
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+apply plugin: 'java'
+
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
@@ -34,19 +39,6 @@ jar {
     from configurations.includeLibs.collect { it.isDirectory() ? it : zipTree(it) }
 }
 
-// Set SPIGOT_LOC to the location of your server and SPIGOT_JAR as the name of the jar file in the server you want to run
-// DIReallyKnowWhatIAmDoingISwear is to remove the stupid pause spigot has at the start
-task runJar() {
-    doLast {
-        javaexec {
-            main "-jar"
-            args "${System.env.MC_SERVER_LOC}\\${System.env.MC_SERVER_JAR}.jar"
-            jvmArgs = ["-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005", "-DIReallyKnowWhatIAmDoingISwear=true"]
-            workingDir "${System.env.MC_SERVER_LOC}"
-        }
-    }
-}
-
 
 // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
 // if it is present.

core/build.gradle

@@ -1,3 +1,6 @@
+apply plugin: 'maven-publish'
+apply plugin: 'idea'
+apply plugin: 'eclipse'
 
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'

docs/README.md

@@ -0,0 +1,6 @@
+Advanced Portals Documentation
+=============================
+
+# Changelogs
+ * [Main Release Changelogs](./changelogs/CHANGELOG.md)
+ * [Snapshot Release Changelogs](./changelogs/SNAPSHOT_CHANGELOG.md)

gradle.properties

@@ -1,6 +1,7 @@
 z# https://docs.gradle.org/current/userguide/build_environment.html
 # Disable with --no-build-cache
 org.gradle.caching=true
+version=1.0.0-0
 
 github=https://github.com/sekwah41/Advanced-Portals
 curse_project_id=86001

lang/build.gradle

@@ -0,0 +1,3 @@
+// Check the root build.gradle under allprojects for common settings
+
+

settings.gradle

@@ -2,6 +2,7 @@ rootProject.name = "advanced-portals"
 // Core modules
 include 'core'
 include 'api'
+include 'lang'
 
 // Implementations
 include 'spigot'

spigot/build.gradle

@@ -1,7 +1,4 @@
-
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
-}
+// Check the root build.gradle under allprojects for common settings
 
 configurations {
     // configuration that holds jars to copy into lib
@@ -26,16 +23,3 @@ jar {
         it.isDirectory() ? it : zipTree(it)
     }
 }
-
-// Set SPIGOT_LOC to the location of your server and SPIGOT_JAR as the name of the jar file in the server you want to run
-// DIReallyKnowWhatIAmDoingISwear is to remove the stupid pause spigot has at the start
-task runJar() {
-    doLast {
-        javaexec {
-            main "-jar"
-            args "${System.env.MC_SERVER_LOC}\\${System.env.MC_SERVER_JAR}.jar"
-            jvmArgs = ["-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005", "-DIReallyKnowWhatIAmDoingISwear=true"]
-            workingDir "${System.env.MC_SERVER_LOC}"
-        }
-    }
-}

velocity/build.gradle

@@ -0,0 +1,25 @@
+// Check the root build.gradle under allprojects for common settings
+
+configurations {
+    // configuration that holds jars to copy into lib
+    includeLibs
+}
+
+repositories {
+    maven { url "https://repo.maven.apache.org/maven2" }
+    maven { url "https://nexus.velocitypowered.com/repository/maven-public/" }
+}
+
+// includeLibs just says to include the library in the final jar
+dependencies {
+    implementation project(":core")
+
+    implementation "com.velocitypowered:velocity-api:1.1.0-SNAPSHOT"
+    annotationProcessor "com.velocitypowered:velocity-api:1.1.0-SNAPSHOT"
+}
+
+jar {
+    from configurations.includeLibs.collect {
+        it.isDirectory() ? it : zipTree(it)
+    }
+}