Verified Commit 9dfeb3b7 authored by Konstantin Kopper's avatar Konstantin Kopper
Browse files

Removed deprecations from Gradle 6.0

parent 923f3500
Pipeline #14404 passed with stages
in 5 minutes and 23 seconds
......@@ -93,6 +93,8 @@ val jar by tasks.getting(Jar::class) {
attributes(mapOf("Main-Class" to "fxGui.MainKt", "Class-Path" to "."))
}
duplicatesStrategy = DuplicatesStrategy.INCLUDE
listOf("implementation", "runtimeOnly")
.map { name -> configurations[name].apply { isCanBeResolved = true } }
.forEach { config -> from(config.map { if (it.isDirectory) files(it) else zipTree(it) }) }
......@@ -203,13 +205,13 @@ dependencies {
open class AspectJTask : DefaultTask() {
@Input
@InputFiles
lateinit var inPath: FileCollection
@Input
@InputFiles
lateinit var sources: FileCollection
@Input
@InputFiles
lateinit var classpath: FileCollection
@Internal
......@@ -241,19 +243,19 @@ open class AspectJTask : DefaultTask() {
val pseucoJavaCompilerProject = project(":pseuco-java-compiler")
val compilerAspects by tasks.creating(AspectJTask::class) {
classpath = files(pseucoJavaCompilerProject.configurations["compile"], ajrt)
classpath = files(pseucoJavaCompilerProject.configurations.compileClasspath, ajrt)
taskClasspath = ajtools.asPath
inPath = pseucoJavaCompilerProject.files("build/originalClasses")
sources = project.files("src/main/kotlin/pseuco/javaCompiler/")
destination = pseucoJavaCompilerProject.file("build/classes/java/main")
destination = pseucoJavaCompilerProject.tasks.compileJava.get().destinationDir
dependsOn(pseucoJavaCompilerProject.tasks["compileJava"])
dependsOn(pseucoJavaCompilerProject.tasks.compileJava)
}
pseucoJavaCompilerProject.tasks {
getByName<JavaCompile>("compileJava") { destinationDir = pseucoJavaCompilerProject.file("build/originalClasses") }
getByName<Task>("classes").dependsOn(compilerAspects)
compileJava { destinationDir = pseucoJavaCompilerProject.file("build/originalClasses") }
classes { dependsOn(compilerAspects) }
}
/* --- Dokka --- */
......@@ -294,7 +296,7 @@ val dokka by tasks.getting(DokkaTask::class) {
}
externalDocumentationLink {
url = url("https://api.ktor.io/1.2.4/") // TODO replace by ktorVersion
url = url("https://api.ktor.io/1.2.4/") // TODO replace by ktorVersion
}
linkMapping {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment