Skip to content

Eliminate JitPack #1211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ allprojects {

repositories {
mavenCentral()
maven("https://jitpack.io")
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")
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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-FORK-2
kotlinVersion=1.7.20
log4j2Version=2.13.3
coroutinesVersion=1.6.3
Expand Down
2 changes: 1 addition & 1 deletion utbot-analytics/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions utbot-framework-api/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion utbot-framework-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion utbot-framework/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions utbot-fuzzers/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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"
}
Expand All @@ -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)
}
Expand Down
3 changes: 1 addition & 2 deletions utbot-intellij/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion utbot-junit-contest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions utbot-summary/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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")
Expand Down