Skip to content

Commit ef179dd

Browse files
committed
Don't try to use BuildLayout from Project scope
It's only accessible from Settings scope
1 parent ecbdd0a commit ef179dd

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/PaperweightCore.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ abstract class PaperweightCore : Plugin<Project> {
6161
Git.checkForGit(target.providers)
6262
printId<PaperweightCore>("paperweight-core", target.gradle)
6363

64-
val ext = target.extensions.create<PaperweightCoreExtension>(PAPERWEIGHT_EXTENSION)
64+
val ext = target.extensions.create<PaperweightCoreExtension>(PAPERWEIGHT_EXTENSION, target)
6565

6666
target.gradle.sharedServices.registerIfAbsent(DOWNLOAD_SERVICE_NAME, DownloadService::class) {
6767
parameters.projectPath.set(target.projectDir)

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/extension/ForkConfig.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import io.papermc.paperweight.util.*
2626
import javax.inject.Inject
2727
import org.gradle.api.Action
2828
import org.gradle.api.Named
29-
import org.gradle.api.file.BuildLayout
29+
import org.gradle.api.Project
3030
import org.gradle.api.file.DirectoryProperty
3131
import org.gradle.api.file.RegularFileProperty
3232
import org.gradle.api.model.ObjectFactory
@@ -39,13 +39,13 @@ abstract class ForkConfig @Inject constructor(
3939
private val configName: String,
4040
providers: ProviderFactory,
4141
objects: ObjectFactory,
42-
buildLayout: BuildLayout,
42+
project: Project,
4343
) : Named {
4444
override fun getName(): String {
4545
return configName
4646
}
4747

48-
val rootDirectory: DirectoryProperty = objects.directoryProperty().convention(buildLayout.rootDirectory).finalizedOnRead()
48+
val rootDirectory: DirectoryProperty = objects.directoryProperty().convention(project.rootProject.layout.projectDirectory).finalizedOnRead()
4949
val serverDirectory: DirectoryProperty = objects.dirFrom(rootDirectory, providers.provider { "$name-server" })
5050
val serverPatchesDir: DirectoryProperty = objects.dirFrom(serverDirectory, "minecraft-patches")
5151
val rejectsDir: DirectoryProperty = objects.dirFrom(serverPatchesDir, "rejected")

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/extension/PaperExtension.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ package io.papermc.paperweight.core.extension
2424

2525
import io.papermc.paperweight.util.*
2626
import javax.inject.Inject
27-
import org.gradle.api.file.BuildLayout
27+
import org.gradle.api.Project
2828
import org.gradle.api.file.DirectoryProperty
2929
import org.gradle.api.file.RegularFileProperty
3030
import org.gradle.api.model.ObjectFactory
3131

32-
abstract class PaperExtension @Inject constructor(objects: ObjectFactory, buildLayout: BuildLayout) {
32+
abstract class PaperExtension @Inject constructor(objects: ObjectFactory, project: Project) {
3333

34-
val rootDirectory: DirectoryProperty = objects.directoryProperty().convention(buildLayout.rootDirectory)
34+
val rootDirectory: DirectoryProperty = objects.directoryProperty().convention(project.rootProject.layout.projectDirectory)
3535
val paperServerDir: DirectoryProperty = objects.dirFrom(rootDirectory, "paper-server")
3636
val serverPatchesDir: DirectoryProperty = objects.dirFrom(paperServerDir, "patches")
3737
val rejectsDir: DirectoryProperty = objects.dirFrom(serverPatchesDir, "rejected")

paperweight-core/src/main/kotlin/io/papermc/paperweight/core/extension/PaperweightCoreExtension.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ import io.papermc.paperweight.util.constants.*
2626
import javax.inject.Inject
2727
import org.gradle.api.Action
2828
import org.gradle.api.NamedDomainObjectContainer
29+
import org.gradle.api.Project
2930
import org.gradle.api.file.DirectoryProperty
3031
import org.gradle.api.model.ObjectFactory
3132
import org.gradle.api.provider.ListProperty
3233
import org.gradle.api.provider.Property
3334
import org.gradle.kotlin.dsl.*
3435

35-
abstract class PaperweightCoreExtension @Inject constructor(objects: ObjectFactory) {
36+
abstract class PaperweightCoreExtension @Inject constructor(objects: ObjectFactory, project: Project) {
3637
val minecraftVersion: Property<String> = objects.property()
3738
val minecraftManifestUrl: Property<String> = objects.property<String>().convention(MC_MANIFEST_URL)
3839

@@ -51,7 +52,7 @@ abstract class PaperweightCoreExtension @Inject constructor(objects: ObjectFacto
5152
val reobfPackagesToFix: ListProperty<String> = objects.listProperty()
5253

5354
val spigot = objects.newInstance<SpigotExtension>()
54-
val paper = objects.newInstance<PaperExtension>()
55+
val paper = objects.newInstance<PaperExtension>(project)
5556

5657
@Suppress("unused")
5758
fun spigot(action: Action<in SpigotExtension>) {

0 commit comments

Comments
 (0)