Skip to content

Commit 0a93a9b

Browse files
committed
Merge remote-tracking branch 'origin/master' into fix/failing_6_8_compat_test
2 parents 8811c23 + 41e0903 commit 0a93a9b

37 files changed

+438
-391
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,11 @@ jobs:
6969

7070
- name: Setup Gradle
7171
uses: gradle/gradle-build-action@v2
72-
with:
73-
cache-read-only: false
7472

7573
- name: Cache XDG_CACHE_HOME
7674
uses: actions/cache@v3
7775
with:
78-
path: ~/$XDG_CACHE_HOME
76+
path: ${{ env.XDG_CACHE_HOME }}
7977
key: ${{ runner.os }}-XDG_CACHE_HOME-${{ hashFiles('**/*.gradle*') }}
8078
restore-keys: |
8179
${{ runner.os }}-XDG_CACHE_HOME-

.github/workflows/release-nightly.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,11 @@ jobs:
7575

7676
- name: Setup Gradle
7777
uses: gradle/gradle-build-action@v2
78-
with:
79-
cache-read-only: false
8078

8179
- name: Cache XDG_CACHE_HOME
8280
uses: actions/cache@v3
8381
with:
84-
path: ~/$XDG_CACHE_HOME
82+
path: ${{ env.XDG_CACHE_HOME }}
8583
key: ${{ runner.os }}-XDG_CACHE_HOME-${{ hashFiles('**/*.gradle*') }}
8684
restore-keys: |
8785
${{ runner.os }}-XDG_CACHE_HOME-

.github/workflows/release.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,11 @@ jobs:
2929

3030
- name: Setup Gradle
3131
uses: gradle/gradle-build-action@v2
32-
with:
33-
cache-read-only: false
3432

3533
- name: Cache XDG_CACHE_HOME
3634
uses: actions/cache@v3
3735
with:
38-
path: ~/$XDG_CACHE_HOME
36+
path: ${{ env.XDG_CACHE_HOME }}
3937
key: ${{ runner.os }}-XDG_CACHE_HOME-${{ hashFiles('**/*.gradle*') }}
4038
restore-keys: |
4139
${{ runner.os }}-XDG_CACHE_HOME-

.github/workflows/reusable-codeInspection.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,8 @@ jobs:
1313

1414
- name: Fetch Sources
1515
uses: actions/checkout@v3
16-
17-
- name: Setup Gradle
18-
uses: gradle/gradle-build-action@v2
1916
with:
20-
cache-read-only: false
17+
fetch-depth: 0 # only report issues that appeared in a PR
2118

2219
- name: Qodana - Code Inspection
2320
uses: JetBrains/[email protected]
24-
with:
25-
fetch-depth: 0 # only report issues that appeared in a PR

.github/workflows/reusable-gradleValidation.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ jobs:
1919

2020
- name: Setup Gradle
2121
uses: gradle/gradle-build-action@v2
22-
with:
23-
cache-read-only: false
2422

2523
- name: Gradle Wrapper Validation
2624
uses: gradle/[email protected]

.github/workflows/reusable-integrationTests.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,11 @@ jobs:
3131

3232
- name: Setup Gradle
3333
uses: gradle/gradle-build-action@v2
34-
with:
35-
cache-read-only: false
3634

3735
- name: Cache XDG_CACHE_HOME
3836
uses: actions/cache@v3
3937
with:
40-
path: ~/$XDG_CACHE_HOME
38+
path: ${{ env.XDG_CACHE_HOME }}
4139
key: ${{ runner.os }}-XDG_CACHE_HOME-${{ hashFiles('**/*.gradle*') }}
4240
restore-keys: |
4341
${{ runner.os }}-XDG_CACHE_HOME-
@@ -88,7 +86,7 @@ jobs:
8886
- name: Cache XDG_CACHE_HOME
8987
uses: actions/cache@v3
9088
with:
91-
path: ~/$XDG_CACHE_HOME
89+
path: ${{ env.XDG_CACHE_HOME }}
9290
key: ${{ runner.os }}-XDG_CACHE_HOME-${{ hashFiles('**/*.gradle*') }}
9391
restore-keys: |
9492
${{ runner.os }}-XDG_CACHE_HOME-
@@ -101,7 +99,6 @@ jobs:
10199
- uses: gradle/gradle-build-action@v2
102100
with:
103101
gradle-version: ${{ matrix.gradleVersion }}
104-
cache-read-only: false
105102

106103
- name: Run Verification
107104
working-directory: ${{ github.workspace }}/integration-tests

.github/workflows/reusable-unitTests.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,11 @@ jobs:
4444

4545
- name: Setup Gradle
4646
uses: gradle/gradle-build-action@v2
47-
with:
48-
cache-read-only: false
4947

5048
- name: Cache XDG_CACHE_HOME
5149
uses: actions/cache@v3
5250
with:
53-
path: ~/$XDG_CACHE_HOME
51+
path: ${{ env.XDG_CACHE_HOME }}
5452
key: ${{ runner.os }}-XDG_CACHE_HOME-${{ hashFiles('**/*.gradle*') }}
5553
restore-keys: |
5654
${{ runner.os }}-XDG_CACHE_HOME-

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
### Changed
1616
- Set minimum supported Gradle version from `6.7.1` to `6.8`
17+
- Use information from `product-info.json` for running `223+`
1718

1819
## [1.9.0]
1920
### Added

gradle.properties

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,17 @@ testGradleArguments=
2828
testIntelliJVersion=2021.2.4
2929
testMarkdownPluginVersion=212.5457.16
3030

31-
# Opt-out flag for bundling Kotlin standard library.
32-
# See https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library for details.
33-
# suppress inspection "UnusedProperty"
34-
kotlin.stdlib.default.dependency=false
31+
org.gradle.caching=true
32+
org.gradle.parallel=true
33+
34+
# Dokka is incompatible with the configuration cache https://github.com/Kotlin/dokka/issues/1217
35+
#org.gradle.unsafe.configuration-cache=true
36+
#org.gradle.unsafe.configuration-cache-problems=warn
3537

3638
# https://github.com/gradle/gradle/issues/20416
3739
systemProp.org.gradle.kotlin.dsl.precompiled.accessors.strict=true
3840

39-
# Dokka is incompatible with the configuration cache
40-
org.gradle.caching=true
41-
org.gradle.parallel=true
42-
org.gradle.unsafe.configuration-cache=true
43-
org.gradle.unsafe.configuration-cache-problems=warn
41+
# Opt-out flag for bundling Kotlin standard library.
42+
# See https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library for details.
43+
# suppress inspection "UnusedProperty"
44+
kotlin.stdlib.default.dependency=false

integration-tests/classpath/build.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ tasks {
1212
}
1313

1414
test {
15+
// <workaround>
16+
// apply JUnit compatibility workaround
17+
// https://youtrack.jetbrains.com/issue/IDEA-278926#focus=Comments-27-5561012.0-0
18+
isScanForTestClasses = false
19+
include("**/*Test.class")
20+
// </workaround>
21+
1522
finalizedBy(jacocoTestReport)
1623
}
1724

0 commit comments

Comments
 (0)