Skip to content

Commit c686178

Browse files
committed
Merge branch 'main' into kononov-instrumentation-rdgen
2 parents a2ef81a + 517c9f6 commit c686178

File tree

69 files changed

+20762
-342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+20762
-342
lines changed

.github/workflows/build-and-run-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ env:
1616
jobs:
1717
build-and-run-tests:
1818
uses: ./.github/workflows/build-and-run-tests-from-branch.yml
19+
secrets: inherit
1920

2021

2122
publish-cli-image:

.github/workflows/publish-on-github-packages.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
uses: ./.github/workflows/build-and-run-tests-from-branch.yml
1919
with:
2020
commit_sha: ${{ github.event.inputs.commit_sha }}
21+
secrets: inherit
2122

2223
publish_on_github_packages:
2324
needs: build-and-run-tests

.github/workflows/publish-plugin-and-cli-from-branch.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,11 @@ jobs:
5050

5151
- name: Build UTBot IntelliJ IDEA plugin
5252
run: |
53-
gradle buildPlugin --no-daemon -PsemVer=${{ env.VERSION }}
53+
gradle clean buildPlugin --no-daemon -PsemVer=${{ env.VERSION }}
5454
cd utbot-intellij/build/distributions
5555
unzip utbot-intellij-${{ env.VERSION }}.zip
5656
rm utbot-intellij-${{ env.VERSION }}.zip
57+
5758
- name: Archive UTBot IntelliJ IDEA plugin
5859
uses: actions/upload-artifact@v3
5960
with:
@@ -63,7 +64,7 @@ jobs:
6364
- name: Build UTBot CLI
6465
run: |
6566
cd utbot-cli
66-
gradle build --no-daemon -PsemVer=${{ env.VERSION }}
67+
gradle clean build --no-daemon -PsemVer=${{ env.VERSION }}
6768
6869
- name: Archive UTBot CLI
6970
uses: actions/upload-artifact@v3

.github/workflows/publish-plugin-and-cli.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ on:
44
branches: [main]
55

66
jobs:
7-
build_and_run_tests:
8-
uses: ./.github/workflows/build-and-run-tests-from-branch.yml
9-
107
publish_plugin_and_cli:
11-
needs: build_and_run_tests
128
uses: ./.github/workflows/publish-plugin-and-cli-from-branch.yml
9+
secrets: inherit

gradle/include/jvm-project.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@ dependencies {
1616

1717
compileKotlin {
1818
kotlinOptions {
19-
jvmTarget = JavaVersion.VERSION_11
19+
jvmTarget = JavaVersion.VERSION_1_8
2020
freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"]
2121
allWarningsAsErrors = false
2222
}
2323
}
2424

2525
compileTestKotlin {
2626
kotlinOptions {
27-
jvmTarget = JavaVersion.VERSION_11
27+
jvmTarget = JavaVersion.VERSION_1_8
2828
freeCompilerArgs += ["-Xallow-result-return-type", "-Xsam-conversions=class"]
2929
allWarningsAsErrors = false
3030
}
3131
}
3232

3333
java {
34-
sourceCompatibility = JavaVersion.VERSION_11
35-
targetCompatibility = JavaVersion.VERSION_11
34+
sourceCompatibility = JavaVersion.VERSION_1_8
35+
targetCompatibility = JavaVersion.VERSION_1_8
3636
}
3737

3838
compileJava {
39-
options.compilerArgs << '-Werror' << '-Xlint:all'
39+
options.compilerArgs << '-Xlint:all'
4040
options.encoding = 'UTF-8'
4141
}
4242

0 commit comments

Comments
 (0)