Skip to content

Make UtBot working without usvm tokens #2714

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.

Sign up for GitHub

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
IlyaMuravjov merged 1 commit into from
Dec 13, 2023
Merged

Make UtBot working without usvm tokens #2714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 0 additions & 9 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,21 +98,12 @@ commonsIOVersion=2.11.0
javaxVersion=2.2
jakartaVersion=3.1.0
jacoDbVersion=1.4.3
# TODO could be left outdated here to avoid exceeding GitHub packages drive space,
# TODO run `gradle publishToMavenLocal -Pversion={usvmVersion}` locally in usvm project and update {usvmVersion} locally
usvmVersion=comp-231201-17

# use latest Java 8 compaitable Spring and Spring Boot versions
springVersion=5.3.28
springBootVersion=2.7.13
springSecurityVersion=5.8.5

# Put your GitHub username here to use utbot-junit-contest with usvm
githubActor=<actor>
# Use your GitHub token generated here -- https://github.com/settings/tokens/new?description=USVM&scopes=read:packages
# Keep `read:packages` checkbox selected
githubToken=<token>

# configuration for build server
#
# the following options are passed to gradle command explicitly (see appropriate workflow):
Expand Down
30 changes: 13 additions & 17 deletions utbot-junit-contest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,8 @@ plugins {
apply plugin: 'jacoco'

repositories {
mavenLocal()
mavenCentral()
maven { url 'https://jitpack.io' }
maven {
url = uri('https://maven.pkg.github.com/UnitTestBot/usvm')
credentials {
username = project.githubActor // System.getenv("GITHUB_ACTOR")
password = project.githubToken // System.getenv("GITHUB_TOKEN")
}
}
}

configurations {
Expand All @@ -28,6 +20,9 @@ configurations {
def approximationsRepo = "com.github.UnitTestBot.java-stdlib-approximations"
def approximationsVersion = "bfce4eedde"

def usvmRepo = "com.github.UnitTestBot.usvm"
def usvmVersion = "72924ad"

compileJava {
options.compilerArgs << '-XDignore.symbol.file'
}
Expand Down Expand Up @@ -177,11 +172,11 @@ dependencies {

implementation "org.burningwave:core:12.62.7"

implementation group: "org.usvm", name: "usvm-core", version: usvmVersion
implementation group: "org.usvm", name: "usvm-jvm", version: usvmVersion
implementation group: "org.usvm", name: "usvm-jvm-api", version: usvmVersion
implementation group: "org.usvm", name: "usvm-jvm-instrumentation", version: usvmVersion
implementation group: "org.usvm", name: "usvm-jvm-instrumentation-collectors", version: usvmVersion
implementation "$usvmRepo:usvm-core:$usvmVersion"
implementation "$usvmRepo:usvm-jvm:$usvmVersion"
implementation "$usvmRepo:usvm-jvm-api:$usvmVersion"
implementation "$usvmRepo:usvm-jvm-instrumentation:$usvmVersion"
implementation "$usvmRepo:usvm-jvm-instrumentation-collectors:$usvmVersion"

implementation group: "org.jacodb", name: "jacodb-core", version: jacoDbVersion
implementation group: "org.jacodb", name: "jacodb-analysis", version: jacoDbVersion
Expand All @@ -198,10 +193,11 @@ dependencies {
fetchInstrumentationJar project(path: ':utbot-instrumentation', configuration: 'instrumentationArchive')

approximations "$approximationsRepo:approximations:$approximationsVersion"
usvmApproximationsApi "org.usvm:usvm-jvm-api:$usvmVersion"
usvmInstrumentationCollector "org.usvm:usvm-jvm-instrumentation-collectors:$usvmVersion"
usvmInstrumentationRunner "org.usvm:usvm-jvm-instrumentation:$usvmVersion"
usvmInstrumentationRunner "org.usvm:usvm-jvm-instrumentation-collectors:$usvmVersion"

usvmApproximationsApi "$usvmRepo:usvm-jvm-api:$usvmVersion"
usvmInstrumentationCollector "$usvmRepo:usvm-jvm-instrumentation-collectors:$usvmVersion"
usvmInstrumentationRunner "$usvmRepo:usvm-jvm-instrumentation:$usvmVersion"
usvmInstrumentationRunner "$usvmRepo:usvm-jvm-instrumentation-collectors:$usvmVersion"
}

processResources {
Expand Down