Skip to content

Upgrade build target to Java 17 #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshafeinberg wants to merge 1 commit into
base: upgrade-gradle-9-java8
Choose a base branch
from
Open

Upgrade build target to Java 17 #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
}

Expand Down
10 changes: 5 additions & 5 deletions core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -105,7 +105,7 @@ configurations {
}

tasks.withType(JavaCompile).configureEach {
options.release.set(8)
options.release.set(17)
}

tasks.named("compileJava", JavaCompile) {
Expand Down Expand Up @@ -207,15 +207,15 @@ 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
// javadoc task.
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) {
Expand Down
4 changes: 2 additions & 2 deletions examples/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
}

Expand Down
8 changes: 4 additions & 4 deletions examples/examples/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions examples/java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions proguard/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down