Skip to content
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

v5.4.4 - Downgrades Java 11 -> 8 for Compatibility. #478

Merged
merged 2 commits into from
Oct 17, 2022
Merged

v5.4.4 - Downgrades Java 11 -> 8 for Compatibility. #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8c151d
Downgrade to Java 1.8 for v5.4.4
handstandsam Oct 17, 2022
4d84c75
Rely on source version of our SDK
handstandsam Oct 17, 2022
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 5.4.4 (2022-10-17)
---------------------------------------------
- [Downgrade target back down to Java 1.8 as requested by a user. #476](https://github.com/dropbox/dropbox-sdk-java/issues/476)

## 5.4.3 (2022-10-14)
---------------------------------------------
- Fix: [Make Kotlin optional in OSGI Import-Package statement](https://github.com/dropbox/dropbox-sdk-java/pull/473)
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 @@ -24,7 +24,7 @@ If you're using Maven, then edit your project's "pom.xml" and add this to the `<
<dependency>
<groupId>com.dropbox.core</groupId>
<artifactId>dropbox-core-sdk</artifactId>
<version>5.4.3</version>
<version>5.4.4</version>
</dependency>
```

Expand All @@ -33,7 +33,7 @@ If you are using Gradle, then edit your project's "build.gradle" and add this to
```groovy
dependencies {
// ...
implementation 'com.dropbox.core:dropbox-core-sdk:5.4.3'
implementation 'com.dropbox.core:dropbox-core-sdk:5.4.4'
}
```

Expand Down
4 changes: 2 additions & 2 deletions dropbox-sdk-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ dependencyGuard {
configuration("runtimeClasspath")
}

sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

ext {
mavenName = 'Official Dropbox Java SDK'
Expand Down
2 changes: 1 addition & 1 deletion dropbox-sdk-java/src/main/java/com/dropbox/core/DbxSdkVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ public class DbxSdkVersion
// https://github.com/dropbox/dropbox-sdk-java/issues/357
private static String loadVersion()
{
return "5.4.4-SNAPSHOT";
return "5.4.4";
}
}
4 changes: 2 additions & 2 deletions examples/examples/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ plugins {
description = 'Consolidated Examples'

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions examples/java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ dependencyGuard {
description = 'Java Examples'

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# POM
GROUP = com.dropbox.core
VERSION_NAME=5.4.4-SNAPSHOT
VERSION_NAME=5.4.4

POM_NAME = Dropbox SDK Java
POM_DESCRIPTION = A Java library to access Dropbox's HTTP-based Core API v2.
Expand Down
8 changes: 4 additions & 4 deletions proguard/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ apply plugin: 'java'
description = 'ProGuard minified SDK test suite for ProGuard compatibility tests.'
group = 'com.dropbox.core.test'
archivesBaseName = 'dropbox-proguard-test'
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

ext {
authInfoPropertyName = 'com.dropbox.test.authInfoFile'
Expand All @@ -28,8 +28,8 @@ repositories {
}

dependencies {
implementation group: 'com.dropbox.core', name: 'dropbox-core-sdk', version: '+', changing: true
implementation 'org.testng:testng:6.9.10'
implementation(project(":dropbox-sdk-java"))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought I previously addressed all these references to version +, but not in this test. Updated!

implementation("org.testng:testng:6.9.10")
}

compileJava {
Expand Down