Skip to content

Commit f732efd

Browse files
Merge branch 'ci-test-jdk-11' into 'dev'
[CI] Gradle 8 follow-up: fix toolchain auto-download See merge request objectbox/objectbox-java!122
2 parents 8d15a7f + 033b43c commit f732efd

File tree

3 files changed

+20
-15
lines changed

3 files changed

+20
-15
lines changed

.gitlab-ci.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,12 @@ test-jdk-8:
9999
variables:
100100
TEST_JDK: 8
101101

102-
# JDK 17 is currently the default of the build image. JDK 21 LTS will arrive around September 2023.
103-
# JDK 17 is the latest LTS release.
104-
#test-jdk-17:
105-
# extends: .test-asan-template
106-
# needs: ["test-jdk-8"]
107-
# variables:
108-
# TEST_JDK: 17
102+
# JDK 11 is the next oldest LTS release.
103+
test-jdk-11:
104+
extends: .test-asan-template
105+
needs: ["test-jdk-8"]
106+
variables:
107+
TEST_JDK: 11
109108

110109
test-jdk-x86:
111110
extends: .test-template

settings.gradle

Lines changed: 0 additions & 8 deletions
This file was deleted.

settings.gradle.kts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
plugins {
2+
// Supports resolving toolchains for JVM projects
3+
// https://docs.gradle.org/8.0/userguide/toolchains.html#sub:download_repositories
4+
id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0")
5+
}
6+
7+
include(":objectbox-java-api")
8+
include(":objectbox-java")
9+
include(":objectbox-kotlin")
10+
include(":objectbox-rxjava")
11+
include(":objectbox-rxjava3")
12+
13+
include(":tests:objectbox-java-test")
14+
include(":tests:test-proguard")

0 commit comments

Comments
 (0)