Skip to content

Commit 3504499

Browse files
committed
Tidy up
1 parent 8fd4227 commit 3504499

File tree

1 file changed

+12
-23
lines changed

1 file changed

+12
-23
lines changed

build.gradle

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
plugins {
22
id 'java-library'
3-
id 'scala'
4-
id "org.jetbrains.kotlin.jvm" version "1.6.20"
3+
id 'scala'
54
id "com.palantir.git-version" version "0.14.0"
65
}
76

@@ -14,12 +13,6 @@ java {
1413
}
1514
}
1615

17-
kotlin {
18-
jvmToolchain {
19-
languageVersion = JavaLanguageVersion.of(11)
20-
}
21-
}
22-
2316
test {
2417
useJUnitPlatform()
2518
//jvmArgs["-Djava.awt.headless=true"]
@@ -32,9 +25,8 @@ repositories {
3225

3326
dependencies {
3427
implementation 'org.scala-lang:scala-library:2.13.9'
35-
testImplementation 'org.scalatest:scalatest_2.13:3.2.0'
36-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
37-
testImplementation 'org.jetbrains.kotlin:kotlin-test'
28+
testImplementation 'org.scalatest:scalatest_2.13:3.2.0'
29+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
3830
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
3931
testImplementation 'org.assertj:assertj-core:3.9.2'
4032
testImplementation 'org.assertj:assertj-swing-junit:3.9.2'
@@ -47,15 +39,15 @@ task versionGen {
4739
outputs.upToDateWhen { false }
4840
outputs.file(versionFile)
4941
doLast {
50-
new File(versionFile).text = """${gitVersion()}
42+
new File(versionFile).text = """${gitVersion()}
5143
"""
5244
}
5345
}
5446

5547
tasks.named('jar') {
5648
dependsOn versionGen
5749
dependsOn test
58-
dependsOn scaladoc
50+
dependsOn scaladoc
5951
manifest {
6052
attributes('Implementation-Title': name,
6153
'Implementation-Version': rootProject.version,
@@ -64,18 +56,15 @@ tasks.named('jar') {
6456
archiveBaseName.set(rootProject.name)
6557
archiveVersion.set(rootProject.version)
6658

67-
from('src/main/kotlin') {
68-
include '**/*.kt'
69-
}
70-
from('src/main/scala') {
59+
from('src/main/scala') {
7160
include '**/*.scala'
72-
include '**/*.java'
61+
include '**/*.java'
7362
}
74-
from(scaladoc.outputs.files) {
75-
include '**'
76-
exclude 'hevs/utils/ScalaDocSetup.html'
77-
exclude 'index.html'
78-
}
63+
from(scaladoc.outputs.files) {
64+
include '**'
65+
exclude 'hevs/utils/ScalaDocSetup.html'
66+
exclude 'index.html'
67+
}
7968

8069
from("$genDir") {
8170
rename {

0 commit comments

Comments
 (0)