From e714d71e4aa665a7dff581b8ac5c45b53bb543f2 Mon Sep 17 00:00:00 2001 From: Maksim Pelevin Date: Tue, 23 Aug 2022 12:15:31 +0300 Subject: [PATCH 1/4] Updated gradle configuration --- gradle/include/jvm-project.gradle | 8 ++++---- utbot-cli/build.gradle | 7 ------- utbot-core/build.gradle | 13 ------------- utbot-framework-api/build.gradle | 14 -------------- utbot-framework/build.gradle | 14 -------------- utbot-instrumentation-tests/build.gradle | 2 -- utbot-instrumentation/build.gradle | 14 -------------- utbot-intellij/build.gradle | 7 +++++++ utbot-sample/build.gradle | 9 --------- utbot-summary/build.gradle | 14 -------------- 10 files changed, 11 insertions(+), 91 deletions(-) diff --git a/gradle/include/jvm-project.gradle b/gradle/include/jvm-project.gradle index 309959b517..81dc6c1c90 100644 --- a/gradle/include/jvm-project.gradle +++ b/gradle/include/jvm-project.gradle @@ -16,7 +16,7 @@ dependencies { compileKotlin { kotlinOptions { - jvmTarget = JavaVersion.VERSION_11 + jvmTarget = JavaVersion.VERSION_1_8 freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"] allWarningsAsErrors = false } @@ -24,15 +24,15 @@ compileKotlin { compileTestKotlin { kotlinOptions { - jvmTarget = JavaVersion.VERSION_11 + jvmTarget = JavaVersion.VERSION_1_8 freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"] allWarningsAsErrors = false } } java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } compileJava { diff --git a/utbot-cli/build.gradle b/utbot-cli/build.gradle index 3c0982da04..c467722549 100644 --- a/utbot-cli/build.gradle +++ b/utbot-cli/build.gradle @@ -5,13 +5,6 @@ configurations { fetchInstrumentationJar } -compileKotlin { - dependsOn project(':utbot-instrumentation').tasks.jar - kotlinOptions { - allWarningsAsErrors = false - } -} - dependencies { api project(':utbot-framework-api') implementation project(':utbot-framework') diff --git a/utbot-core/build.gradle b/utbot-core/build.gradle index b6c45a9248..e8bc1b4ae0 100644 --- a/utbot-core/build.gradle +++ b/utbot-core/build.gradle @@ -11,19 +11,6 @@ dependencies { testImplementation group: 'junit', name: 'junit', version: junit4_version } -compileKotlin { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8 - freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"] - allWarningsAsErrors = false - } -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - shadowJar { configurations = [project.configurations.compileClasspath] archiveClassifier.set('') diff --git a/utbot-framework-api/build.gradle b/utbot-framework-api/build.gradle index dca0d4fef3..8b4b49b0e3 100644 --- a/utbot-framework-api/build.gradle +++ b/utbot-framework-api/build.gradle @@ -4,20 +4,6 @@ plugins { apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle" -compileKotlin { - dependsOn project(':utbot-api').tasks.jar - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8 - freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"] - allWarningsAsErrors = false - } -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - dependencies { api project(':utbot-core') api project(':utbot-api') diff --git a/utbot-framework/build.gradle b/utbot-framework/build.gradle index a5449a98bb..e1c18ee7fa 100644 --- a/utbot-framework/build.gradle +++ b/utbot-framework/build.gradle @@ -12,20 +12,6 @@ configurations { z3native } -compileKotlin { - dependsOn project(':utbot-fuzzers').tasks.jar - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8 - freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"] - allWarningsAsErrors = false - } -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - dependencies { api project(':utbot-core') diff --git a/utbot-instrumentation-tests/build.gradle b/utbot-instrumentation-tests/build.gradle index a3e9136a82..9a923850c9 100644 --- a/utbot-instrumentation-tests/build.gradle +++ b/utbot-instrumentation-tests/build.gradle @@ -1,7 +1,5 @@ apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle" -compileTestJava.dependsOn project(':utbot-instrumentation').tasks.jar - //noinspection GroovyAssignabilityCheck configurations { fetchInstrumentationJar diff --git a/utbot-instrumentation/build.gradle b/utbot-instrumentation/build.gradle index a824d04d59..4943a580d1 100644 --- a/utbot-instrumentation/build.gradle +++ b/utbot-instrumentation/build.gradle @@ -15,20 +15,6 @@ dependencies { implementation group: 'org.mockito', name: 'mockito-inline', version: '4.2.0' } -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - -compileKotlin { - dependsOn project(':utbot-api').tasks.jar - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8 - freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"] - allWarningsAsErrors = false - } -} - jar { duplicatesStrategy = DuplicatesStrategy.EXCLUDE diff --git a/utbot-intellij/build.gradle b/utbot-intellij/build.gradle index 8353c72398..edbda81830 100644 --- a/utbot-intellij/build.gradle +++ b/utbot-intellij/build.gradle @@ -2,10 +2,17 @@ apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle" compileKotlin { kotlinOptions { + jvmTarget = JavaVersion.VERSION_11 + freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"] allWarningsAsErrors = false } } +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 +} + buildscript { repositories { maven { diff --git a/utbot-sample/build.gradle b/utbot-sample/build.gradle index d362e686c7..aab4f671c3 100644 --- a/utbot-sample/build.gradle +++ b/utbot-sample/build.gradle @@ -24,15 +24,6 @@ dependencies { testImplementation "org.mockito:mockito-inline:+" } -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - -compileJava { - dependsOn project(':utbot-api').tasks.jar -} - test { minHeapSize = "128m" maxHeapSize = "3072m" diff --git a/utbot-summary/build.gradle b/utbot-summary/build.gradle index 831f3bd432..8b6ac73218 100644 --- a/utbot-summary/build.gradle +++ b/utbot-summary/build.gradle @@ -1,19 +1,5 @@ apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle" -compileKotlin { - dependsOn project(':utbot-api').tasks.jar - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8 - freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"] - allWarningsAsErrors = false - } -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - dependencies { implementation "com.github.UnitTestBot:soot:${soot_commit_hash}" api project(':utbot-framework-api') From 602fc062b89520c525d5d1853e079894d1b5d2f0 Mon Sep 17 00:00:00 2001 From: Maksim Pelevin Date: Wed, 24 Aug 2022 11:22:19 +0300 Subject: [PATCH 2/4] Remove Werror for a while --- gradle/include/jvm-project.gradle | 2 +- utbot-analytics/build.gradle | 1 - utbot-sample/build.gradle | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle/include/jvm-project.gradle b/gradle/include/jvm-project.gradle index 81dc6c1c90..fd11714796 100644 --- a/gradle/include/jvm-project.gradle +++ b/gradle/include/jvm-project.gradle @@ -36,7 +36,7 @@ java { } compileJava { - options.compilerArgs << '-Werror' << '-Xlint:all' + options.compilerArgs << '-Xlint:all' options.encoding = 'UTF-8' } diff --git a/utbot-analytics/build.gradle b/utbot-analytics/build.gradle index ba7ec9dc61..27aae599d9 100644 --- a/utbot-analytics/build.gradle +++ b/utbot-analytics/build.gradle @@ -9,7 +9,6 @@ if (osName == "mac") osName = "macosx" String classifier = osName + "-x86_64" evaluationDependsOn(':utbot-framework') -compileKotlin.dependsOn project(':utbot-instrumentation').tasks.jar compileTestJava.dependsOn tasks.getByPath(':utbot-framework:testClasses') dependencies { diff --git a/utbot-sample/build.gradle b/utbot-sample/build.gradle index aab4f671c3..e0164aeb0a 100644 --- a/utbot-sample/build.gradle +++ b/utbot-sample/build.gradle @@ -3,6 +3,8 @@ plugins { id 'java-library' } +apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle" + dependencies { implementation group: 'org.jetbrains', name: 'annotations', version: '16.0.2' implementation group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: '1.3.9-1' From b223ca1351225991a150bb01a0ec99894ec2a24b Mon Sep 17 00:00:00 2001 From: Maksim Pelevin Date: Wed, 24 Aug 2022 13:11:28 +0300 Subject: [PATCH 3/4] Use java 8 as source for intellij plugin --- utbot-intellij/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utbot-intellij/build.gradle b/utbot-intellij/build.gradle index edbda81830..bdfd6fe3eb 100644 --- a/utbot-intellij/build.gradle +++ b/utbot-intellij/build.gradle @@ -9,7 +9,7 @@ compileKotlin { } java { - sourceCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_11 } From f75fd48aa8db2fdab92c671923134cf0e23dad09 Mon Sep 17 00:00:00 2001 From: Maksim Pelevin Date: Thu, 25 Aug 2022 09:40:47 +0300 Subject: [PATCH 4/4] Remove duplicates in utbot-summary --- utbot-summary/build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/utbot-summary/build.gradle b/utbot-summary/build.gradle index 8b6ac73218..28634568e1 100644 --- a/utbot-summary/build.gradle +++ b/utbot-summary/build.gradle @@ -9,10 +9,6 @@ dependencies { implementation group: 'com.github.haifengl', name: 'smile-core', version: '2.6.0' api project(':utbot-fuzzers') implementation(project(':utbot-instrumentation')) - api(project(':utbot-instrumentation')) - - implementation group: 'com.github.haifengl', name: 'smile-kotlin', version: '2.6.0' - implementation group: 'com.github.haifengl', name: 'smile-core', version: '2.6.0' implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlin_logging_version