Skip to content

Commit 73b6e89

Browse files
MarkoutteMarkoutte
authored
Updated gradle configuration (#764)
1 parent 928d6ad commit 73b6e89

File tree

11 files changed

+14
-97
lines changed

11 files changed

+14
-97
lines changed

‎gradle/include/jvm-project.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@ dependencies {
1616

1717
compileKotlin {
1818
kotlinOptions {
19-
jvmTarget = JavaVersion.VERSION_11
19+
jvmTarget = JavaVersion.VERSION_1_8
2020
freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"]
2121
allWarningsAsErrors = false
2222
}
2323
}
2424

2525
compileTestKotlin {
2626
kotlinOptions {
27-
jvmTarget = JavaVersion.VERSION_11
27+
jvmTarget = JavaVersion.VERSION_1_8
2828
freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"]
2929
allWarningsAsErrors = false
3030
}
3131
}
3232

3333
java {
34-
sourceCompatibility = JavaVersion.VERSION_11
35-
targetCompatibility = JavaVersion.VERSION_11
34+
sourceCompatibility = JavaVersion.VERSION_1_8
35+
targetCompatibility = JavaVersion.VERSION_1_8
3636
}
3737

3838
compileJava {
39-
options.compilerArgs << '-Werror' << '-Xlint:all'
39+
options.compilerArgs << '-Xlint:all'
4040
options.encoding = 'UTF-8'
4141
}
4242

‎utbot-analytics/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ if (osName == "mac") osName = "macosx"
99
String classifier = osName + "-x86_64"
1010

1111
evaluationDependsOn(':utbot-framework')
12-
compileKotlin.dependsOn project(':utbot-instrumentation').tasks.jar
1312
compileTestJava.dependsOn tasks.getByPath(':utbot-framework:testClasses')
1413

1514
dependencies {

‎utbot-cli/build.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ configurations {
55
fetchInstrumentationJar
66
}
77

8-
compileKotlin {
9-
dependsOn project(':utbot-instrumentation').tasks.jar
10-
kotlinOptions {
11-
allWarningsAsErrors = false
12-
}
13-
}
14-
158
dependencies {
169
api project(':utbot-framework-api')
1710
implementation project(':utbot-framework')

‎utbot-core/build.gradle

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,6 @@ dependencies {
1111
testImplementation group: 'junit', name: 'junit', version: junit4_version
1212
}
1313

14-
compileKotlin {
15-
kotlinOptions {
16-
jvmTarget = JavaVersion.VERSION_1_8
17-
freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"]
18-
allWarningsAsErrors = false
19-
}
20-
}
21-
22-
java {
23-
sourceCompatibility = JavaVersion.VERSION_1_8
24-
targetCompatibility = JavaVersion.VERSION_1_8
25-
}
26-
2714
shadowJar {
2815
configurations = [project.configurations.compileClasspath]
2916
archiveClassifier.set('')

‎utbot-framework-api/build.gradle

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,6 @@ plugins {
44

55
apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle"
66

7-
compileKotlin {
8-
dependsOn project(':utbot-api').tasks.jar
9-
kotlinOptions {
10-
jvmTarget = JavaVersion.VERSION_1_8
11-
freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"]
12-
allWarningsAsErrors = false
13-
}
14-
}
15-
16-
java {
17-
sourceCompatibility = JavaVersion.VERSION_1_8
18-
targetCompatibility = JavaVersion.VERSION_1_8
19-
}
20-
217
dependencies {
228
api project(':utbot-core')
239
api project(':utbot-api')

‎utbot-framework/build.gradle

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,6 @@ configurations {
1212
z3native
1313
}
1414

15-
compileKotlin {
16-
dependsOn project(':utbot-fuzzers').tasks.jar
17-
kotlinOptions {
18-
jvmTarget = JavaVersion.VERSION_1_8
19-
freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"]
20-
allWarningsAsErrors = false
21-
}
22-
}
23-
24-
java {
25-
sourceCompatibility = JavaVersion.VERSION_1_8
26-
targetCompatibility = JavaVersion.VERSION_1_8
27-
}
28-
2915
dependencies {
3016

3117
api project(':utbot-core')

‎utbot-instrumentation-tests/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle"
22

3-
compileTestJava.dependsOn project(':utbot-instrumentation').tasks.jar
4-
53
//noinspection GroovyAssignabilityCheck
64
configurations {
75
fetchInstrumentationJar

‎utbot-instrumentation/build.gradle

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,6 @@ dependencies {
1515
implementation group: 'org.mockito', name: 'mockito-inline', version: '4.2.0'
1616
}
1717

18-
java {
19-
sourceCompatibility = JavaVersion.VERSION_1_8
20-
targetCompatibility = JavaVersion.VERSION_1_8
21-
}
22-
23-
compileKotlin {
24-
dependsOn project(':utbot-api').tasks.jar
25-
kotlinOptions {
26-
jvmTarget = JavaVersion.VERSION_1_8
27-
freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"]
28-
allWarningsAsErrors = false
29-
}
30-
}
31-
3218
jar {
3319
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
3420

‎utbot-intellij/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@ apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle"
22

33
compileKotlin {
44
kotlinOptions {
5+
jvmTarget = JavaVersion.VERSION_11
6+
freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"]
57
allWarningsAsErrors = false
68
}
79
}
810

11+
java {
12+
sourceCompatibility = JavaVersion.VERSION_1_8
13+
targetCompatibility = JavaVersion.VERSION_11
14+
}
15+
916
buildscript {
1017
repositories {
1118
maven {

‎utbot-sample/build.gradle

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ plugins {
33
id 'java-library'
44
}
55

6+
apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle"
7+
68
dependencies {
79
implementation group: 'org.jetbrains', name: 'annotations', version: '16.0.2'
810
implementation group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: '1.3.9-1'
@@ -24,15 +26,6 @@ dependencies {
2426
testImplementation "org.mockito:mockito-inline:+"
2527
}
2628

27-
java {
28-
sourceCompatibility = JavaVersion.VERSION_1_8
29-
targetCompatibility = JavaVersion.VERSION_1_8
30-
}
31-
32-
compileJava {
33-
dependsOn project(':utbot-api').tasks.jar
34-
}
35-
3629
test {
3730
minHeapSize = "128m"
3831
maxHeapSize = "3072m"

‎utbot-summary/build.gradle

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
11
apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle"
22

3-
compileKotlin {
4-
dependsOn project(':utbot-api').tasks.jar
5-
kotlinOptions {
6-
jvmTarget = JavaVersion.VERSION_1_8
7-
freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"]
8-
allWarningsAsErrors = false
9-
}
10-
}
11-
12-
java {
13-
sourceCompatibility = JavaVersion.VERSION_1_8
14-
targetCompatibility = JavaVersion.VERSION_1_8
15-
}
16-
173
dependencies {
184
implementation "com.github.UnitTestBot:soot:${soot_commit_hash}"
195
api project(':utbot-framework-api')
@@ -23,10 +9,6 @@ dependencies {
239
implementation group: 'com.github.haifengl', name: 'smile-core', version: '2.6.0'
2410
api project(':utbot-fuzzers')
2511
implementation(project(':utbot-instrumentation'))
26-
api(project(':utbot-instrumentation'))
27-
28-
implementation group: 'com.github.haifengl', name: 'smile-kotlin', version: '2.6.0'
29-
implementation group: 'com.github.haifengl', name: 'smile-core', version: '2.6.0'
3012

3113
implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlin_logging_version
3214

0 commit comments

Comments
 (0)