resolved buildDir is deprecated issues.

PlumyGames · Dec 12, 2023 · c654f35 · c654f35
1 parent de3d0c1
commit c654f35
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 kotlin.code.style=official
 pluginName=PlumyMindustryGradlePlugin
 arcVersion=v136.1
-mgppVersion=1.3.0
+mgppVersion=1.3.1
diff --git a/main/src/io/github/liplum/mindustry/Plugins.kt b/main/src/io/github/liplum/mindustry/Plugins.kt
@@ -25,7 +25,7 @@ class MindustryPlugin : Plugin<Project> {
         val ex = target.extensions.getOrCreate<MindustryExtension>(
             Mgpp.MainExtensionName
         )
-        val assets = extensions.getOrCreate<MindustryAssetsExtension>(
+        extensions.getOrCreate<MindustryAssetsExtension>(
             Mgpp.AssetExtensionName
         )
         /**
@@ -267,7 +267,7 @@ class MindustryAppPlugin : Plugin<Project> {
                     location.set(LocalGameLoc(localOverwrite))
                 else location.set(ex._server.location)
             }
-            val runClient = tasks.register<RunMindustry>("runClient") {
+            tasks.register<RunMindustry>("runClient") {
                 group = Mgpp.MindustryTaskGroup
                 dependsOn(downloadClient)
                 mainClass.convention(Mgpp.MindustryDesktopMainClass)
@@ -303,7 +303,7 @@ class MindustryAppPlugin : Plugin<Project> {
                     outputtedMods.from(tasks.getByPath(it))
                 }
             }
-            val runServer = tasks.register<RunMindustry>(
+            tasks.register<RunMindustry>(
                 "runServer",
             ) {
                 group = Mgpp.MindustryTaskGroup

diff --git a/main/src/io/github/liplum/mindustry/WorkspaceCache.kt b/main/src/io/github/liplum/mindustry/WorkspaceCache.kt
@@ -18,7 +18,7 @@ inline fun Project.fetchLatestVersion(
     outOfDate: Long = Mgpp.outOfDataTime,
     fetch: () -> String,
 ): String {
-    val mindustry = rootProject.buildDir.resolve("mindustry")
+    val mindustry = rootProject.layout.buildDirectory.asFile.get().resolve("mindustry")
     val jsonFile = mindustry.resolve("latest_cache.json").ensure()
     val json = if (jsonFile.exists())
         jsonFile.readText()

diff --git a/main/src/io/github/liplum/mindustry/task/GenerateRClass.kt b/main/src/io/github/liplum/mindustry/task/GenerateRClass.kt
@@ -16,7 +16,7 @@ open class GenerateRClass : DefaultTask() {
     init {
         generated.convention(project.provider {
             qualifiedName.get().qualified2FileName(
-                project.buildDir.resolve("generated").resolve(Mgpp.Mindustry)
+                project.layout.buildDirectory.asFile.get().resolve("generated").resolve(Mgpp.Mindustry)
             )
         })
     }