From c963b47c2dd212b7a29dbd80fd491f5548509678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Sat, 8 Jan 2022 17:57:47 +0100
Subject: [PATCH] Replace deprecated method of defining our own generated
source set
---
.../briarproject/briar/desktop/builddata/BuildDataPlugin.kt | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/buildSrc/src/main/kotlin/org/briarproject/briar/desktop/builddata/BuildDataPlugin.kt b/buildSrc/src/main/kotlin/org/briarproject/briar/desktop/builddata/BuildDataPlugin.kt
index 38d44dd34e..6afb72c472 100644
--- a/buildSrc/src/main/kotlin/org/briarproject/briar/desktop/builddata/BuildDataPlugin.kt
+++ b/buildSrc/src/main/kotlin/org/briarproject/briar/desktop/builddata/BuildDataPlugin.kt
@@ -3,7 +3,7 @@ package org.briarproject.briar.desktop.builddata
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.file.SourceDirectorySet
-import org.gradle.api.plugins.JavaPluginConvention
+import org.gradle.api.plugins.JavaPluginExtension
class BuildDataPlugin : Plugin<Project> {
override fun apply(project: Project) {
@@ -20,9 +20,7 @@ class BuildDataPlugin : Plugin<Project> {
project.tasks.findByName("compileJava")!!.dependsOn(task)
val pathBuildDir = project.buildDir.toPath()
val source = Util.getSourceDir(pathBuildDir)
- val sourceSets = project.convention
- .getPlugin(JavaPluginConvention::class.java).sourceSets
- .findByName("main")
+ val sourceSets = project.extensions.getByType(JavaPluginExtension::class.java).sourceSets.findByName("main")
sourceSets!!.java { sourceSet: SourceDirectorySet -> sourceSet.srcDir(source) }
}
}
--
GitLab