Switch to using convention plugin

lukebemishprojects · Feb 2, 2024 · 40e5f6f · 40e5f6f
1 parent 5d235d8
commit 40e5f6f
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 62 deletions.
diff --git a/buildSrc/src/main/groovy/convention.shared.gradle b/buildSrc/src/main/groovy/convention.shared.gradle
@@ -2,6 +2,7 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'idea'
+    id 'dev.lukebemish.conventions.project'
 }
 
 version = rootProject.version
@@ -36,8 +37,6 @@ configurations {
 }
 
 dependencies {
-    compileOnly libs.jetbrains.annotations
-    compileOnly libs.jspecify
     rootProjectLicense project(path: ':', configuration: 'license')
 }
 

diff --git a/fabriquilt/build.gradle b/fabriquilt/build.gradle
@@ -11,9 +11,6 @@ dependencies {
     minecraft libs.minecraft
     modImplementation libs.fabric.loader
     modImplementation libs.fabric.api
-
-    compileOnly libs.autoservice
-    annotationProcessor libs.autoservice
 }
 
 loom {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,16 +10,10 @@ fabric_api = "0.92.1+1.20.4"
 
 mdg_plugin = "1.4.3"
 mdg_dsl = "1.5.1"
-autoservice = "1.1.1"
 
 architectury_loom = "1.4.373"
 quilt_licenser = "2.0.1"
 
-jetbrains_annotations = "24.0.1"
-jspecify = "0.3.0"
-
-managedversioning = "1.2.6"
-
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
 
@@ -28,14 +22,8 @@ fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fab
 
 neoforge = { module = "net.neoforged:neoforge", version.ref = "neoforge" }
 
-jetbrains_annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains_annotations" }
-jspecify = { module = "org.jspecify:jspecify", version.ref = "jspecify" }
-
-autoservice = { module = "com.google.auto.service:auto-service", version.ref = "autoservice" }
-
 [plugins]
 
-managedversioning = { id = "dev.lukebemish.managedversioning", version.ref = "managedversioning" }
 mdg_plugin = { id = "org.groovymc.modsdotgroovy", version.ref = "mdg_plugin" }
 quilt_licenser = { id = "org.quiltmc.gradle.licenser", version.ref = "quilt_licenser" }
 architectury_loom = { id = "dev.architectury.loom", version.ref = "architectury_loom" }
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -17,9 +17,6 @@ dependencies {
         officialMojangMappings()
         parchment("org.parchmentmc.data:parchment-${libs.versions.parchment.minecraft.get()}:${libs.versions.parchment.mappings.get()}@zip")
     }
-
-    compileOnly libs.autoservice
-    annotationProcessor libs.autoservice
 }
 
 loom {

diff --git a/settings.gradle b/settings.gradle
@@ -30,49 +30,8 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gradle.enterprise' version '3.16.1'
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
-}
-
-gradleEnterprise {
-    if (System.getenv('CI') != null) {
-        buildScan {
-            publishAlways()
-            termsOfServiceUrl = "https://gradle.com/terms-of-service"
-            termsOfServiceAgree = "yes"
-        }
-    }
+    id 'dev.lukebemish.conventions.settings' version '0.1.3'
 }
 
 rootProject.name = 'defaultresources'
 include("common", "neoforge", "fabriquilt")
-
-buildCache {
-    if (providers.gradleProperty('buildCacheUrl').orNull) {
-        remote(HttpBuildCache) {
-            url = providers.gradleProperty('buildCacheUrl').orNull
-            credentials {
-                username = providers.gradleProperty('buildCacheUser').orNull
-                password = providers.gradleProperty('buildCachePassword').orNull
-            }
-            if (providers.gradleProperty('buildCachePush').orNull) {
-                push = true
-            } else {
-                push = false
-            }
-        }
-    } else if (System.getenv('BUILD_CACHE_URL')) {
-        remote(HttpBuildCache) {
-            url = System.getenv('BUILD_CACHE_URL')
-            credentials {
-                username = System.getenv('BUILD_CACHE_USER')
-                password = System.getenv('BUILD_CACHE_PASSWORD')
-            }
-            if (System.getenv('BUILD_CACHE_PUSH') || System.getenv('CI')) {
-                push = true
-            } else {
-                push = false
-            }
-        }
-    }
-}