From e66feb53d5b214f5ab63058d6069d267165ca392 Mon Sep 17 00:00:00 2001 From: Josh Feinberg <15068619+joshafeinberg@users.noreply.github.com> Date: Tue, 23 Jun 2026 11:18:02 -0500 Subject: [PATCH] Upgrade build target to Java 17 --- .github/workflows/check.yml | 8 ++++---- README.md | 4 ++-- android/build.gradle | 4 ++-- core/build.gradle | 10 +++++----- examples/android/build.gradle | 4 ++-- examples/examples/build.gradle | 8 ++++---- examples/java/build.gradle | 6 +++--- proguard/build.gradle | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index f2f625c66..423b1cf0e 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -19,10 +19,10 @@ jobs: - name: Gradle Wrapper Validation uses: gradle/actions/wrapper-validation@v4 - - name: Set up JDK 21 + - name: Set up JDK 17 uses: actions/setup-java@v4 with: - java-version: '21' + java-version: '17' distribution: 'zulu' - name: Set up Python @@ -88,11 +88,11 @@ jobs: - name: Gradle Wrapper Validation uses: gradle/actions/wrapper-validation@v4 - - name: Install JDK 21 + - name: Install JDK 17 uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 21 + java-version: 17 - name: Set up Python uses: actions/setup-python@v3 diff --git a/README.md b/README.md index 906f7167e..936d5387a 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Documentation: [Javadocs](https://dropbox.github.io/dropbox-sdk-java/) ### Java Version -The current release of Dropbox SDK Java supports Java 8+. +The current release of Dropbox SDK Java supports Java 17+. ### Android Version @@ -370,7 +370,7 @@ dependencies { The JAR's manifest has the following line: ``` -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))" +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))" ``` Most OSGi containers should provide this capability. Unfortunately, some OSGi containers don't do this correctly and will reject the bundle JAR in the OSGi subsystem context. diff --git a/android/build.gradle b/android/build.gradle index b3cb3750f..11413fd9a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,8 +25,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } } diff --git a/core/build.gradle b/core/build.gradle index 06cf5e7a5..390e5f763 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -18,8 +18,8 @@ dependencyGuard { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } ext { @@ -105,7 +105,7 @@ configurations { } tasks.withType(JavaCompile).configureEach { - options.release.set(8) + options.release.set(17) } tasks.named("compileJava", JavaCompile) { @@ -207,7 +207,7 @@ tasks.named("javadoc", Javadoc) { title = "${project.mavenName} ${versionName} API" failOnError = true - // JDK 8's javadoc has an on-by-default lint called "missing", which requires that everything + // JDK 8+ javadoc has an on-by-default lint called "missing", which requires that everything // be documented. Disable this lint because we intentionally don't document some things. // // NOTE: ugly hack to set our doclint settings due to strange handling of string options by the @@ -215,7 +215,7 @@ tasks.named("javadoc", Javadoc) { if (JavaVersion.current().isJava8Compatible()) { options.addBooleanOption "Xdoclint:all,-missing", true } - options.addStringOption "link", "http://docs.oracle.com/javase/8/docs/api/" + options.addStringOption "link", "https://docs.oracle.com/en/java/javase/17/docs/api/" } tasks.named("jar", Jar) { diff --git a/examples/android/build.gradle b/examples/android/build.gradle index 55e2d7e78..4fbbc4c42 100644 --- a/examples/android/build.gradle +++ b/examples/android/build.gradle @@ -57,8 +57,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } } diff --git a/examples/examples/build.gradle b/examples/examples/build.gradle index c8807e09e..808f45ea1 100644 --- a/examples/examples/build.gradle +++ b/examples/examples/build.gradle @@ -6,18 +6,18 @@ plugins { description = 'Consolidated Examples' java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlin { compilerOptions { - jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8) + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) } } tasks.withType(JavaCompile).configureEach { - options.release.set(8) + options.release.set(17) } dependencies { diff --git a/examples/java/build.gradle b/examples/java/build.gradle index b56f44fc1..816d66be3 100644 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -11,12 +11,12 @@ dependencyGuard { description = 'Java Examples' java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } tasks.withType(JavaCompile).configureEach { - options.release.set(8) + options.release.set(17) } dependencies { diff --git a/proguard/build.gradle b/proguard/build.gradle index 82c7654d7..ae9b4c468 100644 --- a/proguard/build.gradle +++ b/proguard/build.gradle @@ -8,12 +8,12 @@ base { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } tasks.withType(JavaCompile).configureEach { - options.release.set(8) + options.release.set(17) } ext {