From 17973a16f794f870e552c224a064110d8a8d9572 Mon Sep 17 00:00:00 2001 From: Denis Fokin Date: Fri, 21 Oct 2022 14:09:25 +0300 Subject: [PATCH 1/5] Eliminate jitpack --- build.gradle.kts | 1 - gradle.properties | 3 +-- utbot-maven/src/main/resources/pom.xml | 7 ------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 88722424cb..f9acb44d0e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -81,7 +81,6 @@ allprojects { repositories { mavenCentral() - maven("https://jitpack.io") maven("https://plugins.gradle.org/m2") maven("https://www.jetbrains.com/intellij-repository/releases") maven("https://cache-redirector.jetbrains.com/maven-central") diff --git a/gradle.properties b/gradle.properties index 011d320a67..c130c3a60f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -61,6 +61,5 @@ arpackNgVersion=3.7.0-1.5.4 org.gradle.daemon=false org.gradle.parallel=false org.gradle.jvmargs="-XX:MaxHeapSize=6144m" -kotlin.compiler.execution.strategy=in-process -org.gradle.caching=false \ No newline at end of file +org.gradle.caching=true \ No newline at end of file diff --git a/utbot-maven/src/main/resources/pom.xml b/utbot-maven/src/main/resources/pom.xml index 9a9701ea91..fb08981fdd 100644 --- a/utbot-maven/src/main/resources/pom.xml +++ b/utbot-maven/src/main/resources/pom.xml @@ -20,11 +20,4 @@ compile - - - - jitpack.io - https://jitpack.io - - From 1cde30c200482e2d315baf159e89c382dd08c994 Mon Sep 17 00:00:00 2001 From: Denis Fokin Date: Fri, 21 Oct 2022 15:53:36 +0300 Subject: [PATCH 2/5] Substitute soot --- build.gradle.kts | 1 + gradle.properties | 2 +- utbot-analytics/build.gradle | 2 +- utbot-framework-api/build.gradle.kts | 4 ++-- utbot-framework-test/build.gradle | 2 +- utbot-framework/build.gradle | 2 +- utbot-fuzzers/build.gradle.kts | 10 +++++----- utbot-intellij/build.gradle.kts | 3 +-- utbot-junit-contest/build.gradle | 2 +- utbot-summary/build.gradle.kts | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f9acb44d0e..edcf8a74ec 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -81,6 +81,7 @@ allprojects { repositories { mavenCentral() + maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") maven("https://plugins.gradle.org/m2") maven("https://www.jetbrains.com/intellij-repository/releases") maven("https://cache-redirector.jetbrains.com/maven-central") diff --git a/gradle.properties b/gradle.properties index c130c3a60f..f7295f1883 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ junit4PlatformVersion=1.9.0 mockitoVersion=3.5.13 z3Version=4.8.9.1 z3JavaApiVersion=4.8.9 -sootCommitHash=ed85c59 +sootVersion=4.4.0-SNAPSHOT kotlinVersion=1.7.20 log4j2Version=2.13.3 coroutinesVersion=1.6.3 diff --git a/utbot-analytics/build.gradle b/utbot-analytics/build.gradle index 78257d605d..aef242d921 100644 --- a/utbot-analytics/build.gradle +++ b/utbot-analytics/build.gradle @@ -14,7 +14,7 @@ dependencies { testImplementation project(':utbot-sample') testImplementation group: 'junit', name: 'junit', version: junit4Version - implementation "com.github.UnitTestBot:soot:${sootCommitHash}" + implementation "org.unittestbot.soot:soot-utbot-fork:${sootVersion}" implementation group: 'com.github.haifengl', name: 'smile-kotlin', version: '2.6.0' implementation group: 'com.github.haifengl', name: 'smile-plot', version: '2.6.0' implementation group: 'com.github.haifengl', name: 'smile-core', version: '2.6.0' diff --git a/utbot-framework-api/build.gradle.kts b/utbot-framework-api/build.gradle.kts index 607b10e69a..6b4bf6e16e 100644 --- a/utbot-framework-api/build.gradle.kts +++ b/utbot-framework-api/build.gradle.kts @@ -1,7 +1,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar val junit4Version: String by rootProject -val sootCommitHash: String by rootProject +val sootVersion: String by rootProject val commonsLangVersion: String by rootProject val kotlinLoggingVersion: String? by rootProject @@ -15,7 +15,7 @@ dependencies { api(project(":utbot-rd")) implementation(group ="com.jetbrains.rd", name = "rd-framework", version = "2022.3.1") implementation(group ="com.jetbrains.rd", name = "rd-core", version = "2022.3.1") - implementation("com.github.UnitTestBot:soot:${sootCommitHash}") + implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion) // TODO do we really need apache commons? implementation(group = "org.apache.commons", name = "commons-lang3", version = commonsLangVersion) diff --git a/utbot-framework-test/build.gradle b/utbot-framework-test/build.gradle index 23676e0c38..44418de868 100644 --- a/utbot-framework-test/build.gradle +++ b/utbot-framework-test/build.gradle @@ -32,7 +32,7 @@ dependencies { testImplementation project(":utbot-framework").sourceSets.test.output testImplementation project(":utbot-core").sourceSets.test.output - implementation "com.github.UnitTestBot:soot:${sootCommitHash}" + implementation "org.unittestbot.soot:soot-utbot-fork:${sootVersion}" implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: jacksonVersion implementation group: 'org.sosy-lab', name: 'javasmt-solver-z3', version: javasmtSolverZ3Version diff --git a/utbot-framework/build.gradle b/utbot-framework/build.gradle index c22f996332..3b6050b7ea 100644 --- a/utbot-framework/build.gradle +++ b/utbot-framework/build.gradle @@ -19,7 +19,7 @@ dependencies { implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: '2022.3.1' implementation group: 'com.jetbrains.rd', name: 'rd-core', version: '2022.3.1' - implementation "com.github.UnitTestBot:soot:${sootCommitHash}" + implementation "org.unittestbot.soot:soot-utbot-fork:${sootVersion}" implementation group: 'com.esotericsoftware.kryo', name: 'kryo5', version: kryoVersion // this is necessary for serialization of some collections implementation group: 'de.javakaffee', name: 'kryo-serializers', version: kryoSerializersVersion diff --git a/utbot-fuzzers/build.gradle.kts b/utbot-fuzzers/build.gradle.kts index 07015c9dbe..85fb179727 100644 --- a/utbot-fuzzers/build.gradle.kts +++ b/utbot-fuzzers/build.gradle.kts @@ -1,5 +1,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +val sootVersion: String by rootProject +val kotlinLoggingVersion: String by rootProject +val rgxgenVersion: String by rootProject + plugins { id("com.github.johnrengelman.shadow") version "7.1.2" } @@ -11,14 +15,10 @@ tasks { } } -val sootCommitHash: String by rootProject -val kotlinLoggingVersion: String by rootProject -val rgxgenVersion: String by rootProject - dependencies { implementation(project(":utbot-framework-api")) - implementation("com.github.UnitTestBot:soot:${sootCommitHash}") + implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion) implementation(group = "com.github.curious-odd-man", name = "rgxgen", version = rgxgenVersion) } diff --git a/utbot-intellij/build.gradle.kts b/utbot-intellij/build.gradle.kts index b8388b9c74..204604c53c 100644 --- a/utbot-intellij/build.gradle.kts +++ b/utbot-intellij/build.gradle.kts @@ -5,7 +5,7 @@ val jacksonVersion: String? by rootProject val ideType: String? by rootProject val pythonCommunityPluginVersion: String? by rootProject val pythonUltimatePluginVersion: String? by rootProject -val sootCommitHash: String? by rootProject +val sootVersion: String? by rootProject val kryoVersion: String? by rootProject val semVer: String? by rootProject val androidStudioPath: String? by rootProject @@ -82,7 +82,6 @@ tasks { } dependencies { -// implementation("com.github.UnitTestBot:soot:${sootCommitHash}") implementation(group ="com.jetbrains.rd", name = "rd-framework", version = "2022.3.1") implementation(group ="com.jetbrains.rd", name = "rd-core", version = "2022.3.1") implementation(group ="com.esotericsoftware.kryo", name = "kryo5", version = kryoVersion) diff --git a/utbot-junit-contest/build.gradle b/utbot-junit-contest/build.gradle index a14cf5b38d..f7be35ad7c 100644 --- a/utbot-junit-contest/build.gradle +++ b/utbot-junit-contest/build.gradle @@ -52,7 +52,7 @@ dependencies { implementation project(":utbot-framework") implementation project(":utbot-analytics") - implementation "com.github.UnitTestBot:soot:${sootCommitHash}" + implementation "org.unittestbot.soot:soot-utbot-fork:${sootVersion}" implementation group: 'org.apache.commons', name: 'commons-exec', version: '1.2' implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlinLoggingVersion implementation group: 'org.jsoup', name: 'jsoup', version: '1.6.2' diff --git a/utbot-summary/build.gradle.kts b/utbot-summary/build.gradle.kts index 6fe1cdd86a..a141e248c0 100644 --- a/utbot-summary/build.gradle.kts +++ b/utbot-summary/build.gradle.kts @@ -1,12 +1,12 @@ val kotlinLoggingVersion: String by rootProject val junit4Version: String by rootProject val junit5Version: String by rootProject -val sootCommitHash: String by rootProject +val sootVersion: String by rootProject val mockitoVersion: String by rootProject dependencies { implementation(project(":utbot-framework-api")) - implementation("com.github.UnitTestBot:soot:${sootCommitHash}") + implementation("org.unittestbot.soot:soot-utbot-fork:${sootVersion}") implementation(project(":utbot-fuzzers")) implementation(project(":utbot-instrumentation")) implementation(group = "com.github.haifengl", name = "smile-kotlin", version = "2.6.0") From 4a7ceaab785bb0260be89a1cf2a408a729f76dee Mon Sep 17 00:00:00 2001 From: Denis Fokin Date: Fri, 21 Oct 2022 16:25:58 +0300 Subject: [PATCH 3/5] Bring back maven plugin settings --- utbot-maven/src/main/resources/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/utbot-maven/src/main/resources/pom.xml b/utbot-maven/src/main/resources/pom.xml index fb08981fdd..9a9701ea91 100644 --- a/utbot-maven/src/main/resources/pom.xml +++ b/utbot-maven/src/main/resources/pom.xml @@ -20,4 +20,11 @@ compile + + + + jitpack.io + https://jitpack.io + + From 2d0e772a27597bcb1c2e15990cc79bbe3d8f8464 Mon Sep 17 00:00:00 2001 From: Denis Fokin Date: Mon, 24 Oct 2022 18:54:15 +0300 Subject: [PATCH 4/5] Bring back old gradle options --- gradle.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f7295f1883..07108d22e0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -61,5 +61,6 @@ arpackNgVersion=3.7.0-1.5.4 org.gradle.daemon=false org.gradle.parallel=false org.gradle.jvmargs="-XX:MaxHeapSize=6144m" +kotlin.compiler.execution.strategy=in-process -org.gradle.caching=true \ No newline at end of file +org.gradle.caching=false \ No newline at end of file From 523e1f8e02450e923602ac9e1b03f7f09c028ce9 Mon Sep 17 00:00:00 2001 From: Denis Fokin Date: Thu, 27 Oct 2022 13:18:43 +0300 Subject: [PATCH 5/5] Not snapshot repository is added --- build.gradle.kts | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index edcf8a74ec..2fd47915df 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -81,7 +81,7 @@ allprojects { repositories { mavenCentral() - maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") + maven("https://s01.oss.sonatype.org/content/repositories/orgunittestbotsoot-1004/") maven("https://plugins.gradle.org/m2") maven("https://www.jetbrains.com/intellij-repository/releases") maven("https://cache-redirector.jetbrains.com/maven-central") diff --git a/gradle.properties b/gradle.properties index 07108d22e0..1e1b95cccb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ junit4PlatformVersion=1.9.0 mockitoVersion=3.5.13 z3Version=4.8.9.1 z3JavaApiVersion=4.8.9 -sootVersion=4.4.0-SNAPSHOT +sootVersion=4.4.0-FORK-2 kotlinVersion=1.7.20 log4j2Version=2.13.3 coroutinesVersion=1.6.3