Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pseuco-ide
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
10
Issues
10
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pseuco
pseuco-ide
Commits
9dfeb3b7
Verified
Commit
9dfeb3b7
authored
Nov 19, 2019
by
Konstantin Kopper
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed deprecations from Gradle 6.0
parent
923f3500
Pipeline
#14404
passed with stages
in 5 minutes and 23 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
9 deletions
+11
-9
build.gradle.kts
build.gradle.kts
+11
-9
No files found.
build.gradle.kts
View file @
9dfeb3b7
...
...
@@ -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
@Input
Files
lateinit
var
inPath
:
FileCollection
@Input
@Input
Files
lateinit
var
sources
:
FileCollection
@Input
@Input
Files
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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment