Skip to content

Commit ee71e2b

Browse files
committed
Bundle size reduction
1 parent 42ab485 commit ee71e2b

File tree

12 files changed

+49
-22
lines changed

12 files changed

+49
-22
lines changed

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,6 @@ javacpp_version=1.5.3
4242
jsoup_version=1.7.2
4343
djl_api_version=0.17.0
4444
pytorch_native_version=1.9.1
45-
# soot also depends on asm, so there could be two different versions
45+
# soot also depends on asm, so there could be two different versions
46+
47+
kotlin.stdlib.default.dependency=false

utbot-analytics/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle"
2-
apply plugin: "java"
32

43
configurations {
54
mlmodels
@@ -14,7 +13,7 @@ compileTestJava.dependsOn tasks.getByPath(':utbot-framework:testClasses')
1413

1514
dependencies {
1615
implementation(project(":utbot-framework"))
17-
implementation(project(':utbot-instrumentation'))
16+
compile(project(':utbot-instrumentation'))
1817
implementation(project(':utbot-summary'))
1918
testImplementation project(':utbot-sample')
2019
testImplementation group: 'junit', name: 'junit', version: junit4_version

utbot-api/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
1+
plugins {
2+
id "com.github.johnrengelman.shadow" version "6.1.0"
3+
}
4+
15
apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle"
6+
7+
shadowJar {
8+
configurations = [project.configurations.compileClasspath]
9+
archiveClassifier.set('')
10+
minimize()
11+
}

utbot-cli/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ compileKotlin {
66
}
77
}
88

9-
109
dependencies {
1110
api project(":utbot-framework")
12-
api project(":utbot-analytics")
1311
api project(':utbot-summary')
12+
api project(':utbot-instrumentation')
1413

1514
implementation group: 'org.mockito', name: 'mockito-core', version: mockito_version
1615
// Without this dependency testng tests do not run.

utbot-core/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
1+
plugins {
2+
id "com.github.johnrengelman.shadow" version "6.1.0"
3+
}
4+
15
apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle"
26

37
dependencies {
48
implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlin_logging_version
59
implementation group: 'net.java.dev.jna', name: 'jna-platform', version: '5.5.0'
610
}
11+
12+
shadowJar {
13+
configurations = [project.configurations.compileClasspath]
14+
archiveClassifier.set('')
15+
minimize()
16+
}

utbot-framework-api/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
plugins {
2+
id "com.github.johnrengelman.shadow" version "6.1.0"
3+
}
4+
15
apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle"
26

37
dependencies {
@@ -9,3 +13,9 @@ dependencies {
913
implementation group: 'org.apache.commons', name: 'commons-lang3', version: commons_lang_version
1014
implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlin_logging_version
1115
}
16+
17+
shadowJar {
18+
configurations = [project.configurations.compileClasspath]
19+
archiveClassifier.set('')
20+
minimize()
21+
}

utbot-framework/build.gradle

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,18 @@ repositories {
88

99
configurations {
1010
z3native
11-
fetchInstrumentationJar
1211
}
1312

1413
dependencies {
15-
fetchInstrumentationJar project(path: ':utbot-instrumentation', configuration:'instrumentationArchive')
1614

1715
api project(':utbot-core')
16+
api project(':utbot-instrumentation')
1817
api project(':utbot-summary')
1918
implementation 'junit:junit:4.13.1'
2019
api project(':utbot-framework-api')
2120

2221
implementation "com.github.UnitTestBot:soot:${soot_commit_hash}"
2322

24-
api group: 'com.google.guava', name: 'guava', version: guava_version
25-
2623
implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: jackson_version
2724
implementation group: 'org.sosy-lab', name: 'javasmt-solver-z3', version: javasmt_solver_z3_version
2825
implementation group: 'com.github.curious-odd-man', name: 'rgxgen', version: rgxgen_version
@@ -33,7 +30,6 @@ dependencies {
3330
// we need this for construction mocks from composite models
3431
implementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0'
3532
api project(':utbot-api')
36-
api project(':utbot-instrumentation')
3733
api project(':utbot-fuzzers')
3834

3935
testImplementation project(':utbot-summary')
@@ -48,6 +44,7 @@ dependencies {
4844
testImplementation group: 'org.mockito', name: 'mockito-core', version: mockito_version
4945
testImplementation group: 'org.testng', name: 'testng', version: testng_version
5046
testImplementation group: 'org.mockito', name: 'mockito-inline', version: mockito_inline_version
47+
testImplementation group: 'com.google.guava', name: 'guava', version: guava_version
5148

5249
testCompile group: 'org.mockito', name: 'mockito-inline', version: mockito_inline_version
5350
testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4j2_version
@@ -63,11 +60,6 @@ processResources {
6360
into "lib/x64"
6461
}
6562
}
66-
67-
// We will extract this jar in `ChildProcessRunner` class.
68-
from(configurations.fetchInstrumentationJar) {
69-
into "instrumentation-lib"
70-
}
7163
}
7264

7365
test {

utbot-fuzzers/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
plugins {
2+
id "com.github.johnrengelman.shadow" version "6.1.0"
3+
}
4+
15
apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle"
26

37
dependencies {
@@ -9,3 +13,9 @@ dependencies {
913
compileJava {
1014
options.compilerArgs = []
1115
}
16+
17+
shadowJar {
18+
configurations = [project.configurations.compileClasspath]
19+
archiveClassifier.set('')
20+
minimize()
21+
}

utbot-instrumentation/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ dependencies {
1010
implementation group: 'de.javakaffee', name: 'kryo-serializers', version: kryo_serializers_version
1111
implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlin_logging_version
1212

13-
1413
// TODO: this is necessary for inline classes mocking in UtExecutionInstrumentation
1514
implementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0'
1615
implementation group: 'org.mockito', name: 'mockito-inline', version: '4.2.0'

utbot-instrumentation/src/main/kotlin/org/utbot/instrumentation/process/ChildProcessRunner.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class ChildProcessRunner {
5555
companion object {
5656
private const val UTBOT_INSTRUMENTATION = "utbot-instrumentation"
5757
private const val ERRORS_FILE_PREFIX = "utbot-childprocess-errors"
58-
private const val INSTRUMENTATION_LIB = "instrumentation-lib"
58+
private const val INSTRUMENTATION_LIB = "lib"
5959

6060
private const val DEBUG_RUN_CMD = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=5005"
6161

0 commit comments

Comments
 (0)