Merge pull request #31 from CivMC/feature/factorymod

Update to civgradle2

Author: AngrySoundTech

.github/workflows/build.yml

@@ -0,0 +1,24 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: temurin
+
+      - uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build

.github/workflows/publish.yml

@@ -0,0 +1,25 @@
+name: Publish
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: temurin
+
+      - uses: gradle/gradle-build-action@v2
+        with:
+          arguments: publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CIVMC_NEXUS_USER: ${{ secrets.CIVMC_NEXUS_USER }}
+          CIVMC_NEXUS_PASSWORD: ${{ secrets.CIVMC_NEXUS_PASSWORD }}

.github/workflows/pull_request.yml

@@ -1,56 +1,24 @@
-import net.civmc.civgradle.common.util.civRepo
+import net.civmc.civgradle.CivGradleExtension
 
 plugins {
-    `java-library`
-    `maven-publish`
-    id("net.civmc.civgradle.plugin") version "1.0.0-SNAPSHOT"
-}
-
-// Temporary hack:
-// Remove the root build directory
-gradle.buildFinished {
-	project.buildDir.deleteRecursively()
-}
-
-allprojects {
-	group = "net.civmc.factorymod"
-	version = "3.0.2"
-	description = "FactoryMod"
+	id("net.civmc.civgradle") version "2.+" apply false
 }
 
 subprojects {
-	apply(plugin = "net.civmc.civgradle.plugin")
 	apply(plugin = "java-library")
 	apply(plugin = "maven-publish")
+	apply(plugin = "net.civmc.civgradle")
 
-	java {
-		toolchain {
-			languageVersion.set(JavaLanguageVersion.of(17))
-		}
+	configure<CivGradleExtension> {
+		pluginName = project.property("pluginName") as String
 	}
 
 	repositories {
 		mavenCentral()
-        civRepo("CivMC/CivModCore")
-        civRepo("CivMC/NameLayer")
-        civRepo("CivMC/Citadel")
-	}
+		maven("https://repo.civmc.net/repository/maven-public")
+        maven("https://repo.aikar.co/content/groups/aikar/")
+        maven("https://libraries.minecraft.net")
 
-	publishing {
-		repositories {
-			maven {
-				name = "GitHubPackages"
-				url = uri("https://maven.pkg.github.com/CivMC/FactoryMod")
-				credentials {
-					username = System.getenv("GITHUB_ACTOR")
-					password = System.getenv("GITHUB_TOKEN")
-				}
-			}
-		}
-		publications {
-			register<MavenPublication>("gpr") {
-				from(components["java"])
-			}
-		}
+		maven("https://jitpack.io")
 	}
 }

.github/workflows/release_created.yml

@@ -0,0 +1,7 @@
+# Gradle properties
+group = net.civmc.factorymod
+version = 3.0.3
+description = FactoryMod
+
+# Custom Properties
+pluginName = FactoryMod

build.gradle.kts

@@ -1,19 +1,11 @@
 plugins {
-	`java-library`
-	id("net.civmc.civgradle.plugin")
-	id("io.papermc.paperweight.userdev") version "1.3.1"
-}
-
-civGradle {
-	paper {
-		pluginName = "FactoryMod"
-	}
+	id("io.papermc.paperweight.userdev")
 }
 
 dependencies {
 	paperDevBundle("1.18.2-R0.1-SNAPSHOT")
 
-    compileOnly("net.civmc.civmodcore:paper:2.0.0-SNAPSHOT:dev-all")
-	compileOnly("net.civmc.namelayer:paper:3.0.0-SNAPSHOT:dev")
-	compileOnly("net.civmc.citadel:paper:5.0.0-SNAPSHOT:dev")
+    compileOnly("net.civmc.civmodcore:civmodcore-paper:2.3.5:dev-all")
+	compileOnly("net.civmc.namelayer:namelayer-paper:3.0.3:dev")
+	compileOnly("net.civmc.citadel:citadel-paper:5.1.2:dev")
 }

gradle.properties

@@ -1,21 +1,12 @@
-/*
- * This file was generated by the Gradle 'init' task.
- */
-
-rootProject.name = "factorymod"
-
 pluginManagement {
 	repositories {
 		gradlePluginPortal()
+		maven("https://repo.civmc.net/repository/maven-public/")
 		maven("https://papermc.io/repo/repository/maven-public/")
-  		maven {
-			url = uri("https://maven.pkg.github.com/CivMC/CivGradle")
-			credentials {
-				username = System.getenv("GITHUB_ACTOR")
-				password = System.getenv("GITHUB_TOKEN")
-			}
-		}
 	}
 }
 
+rootProject.name = "factorymod"
+
 include(":paper")
+project(":paper").name = rootProject.name + "-paper"