diff --git a/gradle.properties b/gradle.properties index 6a9bfa25f4..c0cfbf7062 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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= -# Use your GitHub token generated here -- https://github.com/settings/tokens/new?description=USVM&scopes=read:packages -# Keep `read:packages` checkbox selected -githubToken= - # configuration for build server # # the following options are passed to gradle command explicitly (see appropriate workflow): diff --git a/utbot-junit-contest/build.gradle b/utbot-junit-contest/build.gradle index e32d9c84c6..6e3d5474ce 100644 --- a/utbot-junit-contest/build.gradle +++ b/utbot-junit-contest/build.gradle @@ -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 { @@ -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' } @@ -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 @@ -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 {