From eacd7b79452f528f09e13cb073242f6db8d158e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=84=A0=EC=9A=B0?= Date: Tue, 14 Jan 2025 20:08:13 +0900 Subject: [PATCH 1/2] Change bindings/java to support java 8 --- .github/workflows/java.yml | 2 +- bindings/java/build.gradle.kts | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 4a8b0310d..88e3a3976 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -32,7 +32,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '17' + java-version: '8' - name: Run Java tests run: make test diff --git a/bindings/java/build.gradle.kts b/bindings/java/build.gradle.kts index 9936bec60..48abcba05 100644 --- a/bindings/java/build.gradle.kts +++ b/bindings/java/build.gradle.kts @@ -4,15 +4,15 @@ import net.ltgt.gradle.errorprone.errorprone plugins { java application - id("net.ltgt.errorprone") version "4.1.0" + id("net.ltgt.errorprone") version "3.1.0" } group = "org.github.tursodatabase" version = "0.0.1-SNAPSHOT" java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } repositories { @@ -20,8 +20,8 @@ repositories { } dependencies { - errorprone("com.uber.nullaway:nullaway:0.12.3") - errorprone("com.google.errorprone:error_prone_core:2.36.0") + errorprone("com.uber.nullaway:nullaway:0.10.26") // maximum version which supports java 8 + errorprone("com.google.errorprone:error_prone_core:2.11.0") testImplementation(platform("org.junit:junit-bom:5.10.0")) testImplementation("org.junit.jupiter:junit-jupiter") From b3883d03d6b16b19fa7c1d03677957e48dab6657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=84=A0=EC=9A=B0?= Date: Tue, 14 Jan 2025 20:14:32 +0900 Subject: [PATCH 2/2] Apply necessary changes for java 8 --- bindings/java/build.gradle.kts | 2 +- .../main/java/org/github/tursodatabase/LimboConnection.java | 2 +- .../java/org/github/tursodatabase/jdbc4/JDBC4Connection.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bindings/java/build.gradle.kts b/bindings/java/build.gradle.kts index 48abcba05..fcdebad3a 100644 --- a/bindings/java/build.gradle.kts +++ b/bindings/java/build.gradle.kts @@ -21,7 +21,7 @@ repositories { dependencies { errorprone("com.uber.nullaway:nullaway:0.10.26") // maximum version which supports java 8 - errorprone("com.google.errorprone:error_prone_core:2.11.0") + errorprone("com.google.errorprone:error_prone_core:2.10.0") // maximum version which supports java 8 testImplementation(platform("org.junit:junit-bom:5.10.0")) testImplementation("org.junit.jupiter:junit-jupiter") diff --git a/bindings/java/src/main/java/org/github/tursodatabase/LimboConnection.java b/bindings/java/src/main/java/org/github/tursodatabase/LimboConnection.java index 5bb5e973f..98f0ad04b 100644 --- a/bindings/java/src/main/java/org/github/tursodatabase/LimboConnection.java +++ b/bindings/java/src/main/java/org/github/tursodatabase/LimboConnection.java @@ -46,7 +46,7 @@ public abstract class LimboConnection implements Connection { } private static AbstractDB open(String url, String fileName, Properties properties) throws SQLException { - if (fileName.isBlank()) { + if (fileName.isEmpty()) { throw new IllegalArgumentException("fileName should not be empty"); } diff --git a/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4Connection.java b/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4Connection.java index 6ffb41e3e..9e67ae501 100644 --- a/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4Connection.java +++ b/bindings/java/src/main/java/org/github/tursodatabase/jdbc4/JDBC4Connection.java @@ -4,6 +4,7 @@ import org.github.tursodatabase.LimboConnection; import org.github.tursodatabase.annotations.SkipNullableCheck; import java.sql.*; +import java.util.HashMap; import java.util.Map; import java.util.Properties; import java.util.concurrent.Executor; @@ -150,7 +151,7 @@ public class JDBC4Connection extends LimboConnection { @Override public Map> getTypeMap() throws SQLException { // TODO - return Map.of(); + return new HashMap<>(); } @Override