Skip to content

Commit 385b4aa

Browse files
committed
set minimum Java to 17
[Closes #8]
1 parent cea5e12 commit 385b4aa

File tree

16 files changed

+21
-12
lines changed

16 files changed

+21
-12
lines changed

.github/workflows/dependency-submission.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/setup-java@v4
2020
with:
2121
distribution: temurin
22-
java-version: 21
22+
java-version: 17
2323

2424
- name: Generate and submit dependency graph
2525
id: dependency-submission

.github/workflows/gradle-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
gradle:
1414
strategy:
1515
matrix:
16-
java: [21, 22, 23]
16+
java: [17, 21, 22, 23]
1717
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@v4

.github/workflows/jreleaser-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/setup-java@v4
2929
with:
3030
distribution: temurin
31-
java-version: 21
31+
java-version: 17
3232
cache: gradle
3333

3434
- name: Setup Gradle

.sdkmanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
java=21.0.5-tem
1+
java=17.0.15-tem
22
jreleaser=1.17.0

buildSrc/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ dependencies {
2020
}
2121

2222
java {
23-
sourceCompatibility = JavaVersion.VERSION_21
24-
targetCompatibility = JavaVersion.VERSION_21
23+
sourceCompatibility = JavaVersion.VERSION_17
24+
targetCompatibility = JavaVersion.VERSION_17
2525
}
2626

2727
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
2828
compilerOptions {
29-
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21 // This option specifies the target version of the generated JVM bytecode
29+
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 // This option specifies the target version of the generated JVM bytecode
3030
}
3131
}

buildSrc/src/main/kotlin/framefork.java.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ repositories {
2020
}
2121

2222
java {
23-
sourceCompatibility = JavaVersion.VERSION_21
24-
targetCompatibility = JavaVersion.VERSION_21
23+
sourceCompatibility = JavaVersion.VERSION_17
24+
targetCompatibility = JavaVersion.VERSION_17
2525
}
2626

2727
kotlin {
@@ -98,13 +98,13 @@ tasks.withType<KotlinCompile>() {
9898
"-Xjvm-default=all",
9999
"-Xsuppress-version-warnings",
100100
)
101-
jvmTarget = JvmTarget.JVM_21 // This option specifies the target version of the generated JVM bytecode
101+
jvmTarget = JvmTarget.JVM_17 // This option specifies the target version of the generated JVM bytecode
102102
}
103103
}
104104

105105
tasks.withType<JavaCompile> {
106106
options.encoding = "UTF-8"
107-
options.compilerArgs.add("-Xlint:all,-fallthrough,-processing,-serial,-classfile,-path,-this-escape")
107+
options.compilerArgs.add("-Xlint:all,-fallthrough,-processing,-serial,-classfile,-path")
108108
options.compilerArgs.add("-parameters")
109109
options.compilerArgs.add("-Werror") // treat warnings as errors
110110

modules/typed-ids-hibernate-61/src/main/java/org/framefork/typedIds/bigint/hibernate/ObjectBigIntIdType.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public ObjectBigIntIdType(final Class<?> implClass)
5959
this(implClass, null);
6060
}
6161

62+
@SuppressWarnings("this-escape")
6263
public ObjectBigIntIdType(final Class<?> implClass, @Nullable final JdbcType longJdbcType)
6364
{
6465
this(longJdbcType);

modules/typed-ids-hibernate-61/src/main/java/org/framefork/typedIds/uuid/hibernate/ObjectUuidArrayType.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
public class ObjectUuidArrayType<T extends ObjectUuid<T>> extends AbstractArrayType<T[]>
2121
{
2222

23+
@SuppressWarnings("this-escape")
2324
public ObjectUuidArrayType(
2425
final Class<T[]> arrayClass,
2526
final ObjectUuidType objectUuidType

modules/typed-ids-hibernate-61/src/main/java/org/framefork/typedIds/uuid/hibernate/ObjectUuidType.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public ObjectUuidType(final Class<?> implClass)
5858
this(implClass, null);
5959
}
6060

61+
@SuppressWarnings("this-escape")
6162
public ObjectUuidType(final Class<?> implClass, @Nullable final JdbcType uuidJdbcType)
6263
{
6364
this(uuidJdbcType);

modules/typed-ids-hibernate-62/src/main/java/org/framefork/typedIds/bigint/hibernate/ObjectBigIntIdType.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public ObjectBigIntIdType(final Class<?> implClass)
5959
this(implClass, null);
6060
}
6161

62+
@SuppressWarnings("this-escape")
6263
public ObjectBigIntIdType(final Class<?> implClass, @Nullable final JdbcType longJdbcType)
6364
{
6465
this(longJdbcType);

0 commit comments

Comments
 (0)