From 22fe258713caf1c84cc4193a635ef14ae32f0840 Mon Sep 17 00:00:00 2001 From: Wojciech Dziemianczyk Date: Fri, 1 Dec 2023 14:11:29 -0500 Subject: [PATCH] Prepare for release 6.0.0 (#514) * Prepare for release 6.0.0 --- CHANGELOG.md | 47 ++++++++++++++++++++++++++++++++++------------- README.md | 4 ++-- RELEASING.md | 9 ++++----- gradle.properties | 2 +- 4 files changed, 41 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6e776f92..3daa4c3c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,24 +1,45 @@ -## 6.0.0-SNAPSHOT -- Updated to `jakarta.servlet` to unblock adoption of Spring Boot v3, **this is a breaking change if you use `DbxSessionStore`.** -- Added better error messaging when trying to build the project without submodules initialized. -- Improved generateStone task to properly declare inputs and outputs -- Removed obsolete javadoc flag -- Updated test dependencies -- Updated to Gradle 7.6.2 -- Removed redundant gradle wrappers - -## 5.4.5 (2023-05-16) + +6.0.0 (2023-11-30) +--------------------------------------------- +Android dependencies have moved to the drop-sdk-java/android directory of this repo and published as a separate artifact. +To migrate, add the following to your dependencies block: + +```@groovy +dependencies { + implementation 'com.dropbox.core:dropbox-android-sdk:6.0.0' +} +``` + +- [#504](https://github.com/dropbox/dropbox-sdk-java/pull/504) Cleanup python codegen and formats java.stoneg.py +- [#503](https://github.com/dropbox/dropbox-sdk-java/pull/503) Point to latest stone +- [#501](https://github.com/dropbox/dropbox-sdk-java/pull/501) Updated to `jakarta.servlet` to unblock adoption of Spring Boot v3, **this is a breaking change if you use `DbxSessionStore`.** + - Improved generateStone task to properly declare inputs and outputs +- [#500](https://github.com/dropbox/dropbox-sdk-java/pull/500) Build Improvements + - Added better error messaging when trying to build the project without submodules initialized. + - Removed obsolete javadoc flag + - Updated test dependencies + - Removed redundant gradle wrappers +- [#499](https://github.com/dropbox/dropbox-sdk-java/pull/499) Update java.stoneg.py for python 3.10 compatability +- [#486](https://github.com/dropbox/dropbox-sdk-java/pull/486) Makes project compatible with config cache + - Removed redundant gradle wrappers + - Updated to Gradle 7.6.2 + - Updated test dependencies + - Removed obsolete javadoc flag + + +5.4.5 (2023-05-16) +--------------------------------------------- - Update jackson-core to 2.15.0 [#492](https://github.com/dropbox/dropbox-sdk-java/issues/476) -## 5.4.4 (2022-10-17) +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) +5.4.3 (2022-10-14) --------------------------------------------- - Fix: [Make Kotlin optional in OSGI Import-Package statement](https://github.com/dropbox/dropbox-sdk-java/pull/473) -## 5.4.2 (2022-10-03) +5.4.2 (2022-10-03) --------------------------------------------- - Update dropbox-api-spec to point to more recent version (Sept 01, 2022) [#431](https://github.com/dropbox/dropbox-sdk-java/pull/431) - Generated stone api code is now checked into repository for greater visibility of spec changes [#418](https://github.com/dropbox/dropbox-sdk-java/pull/418) diff --git a/README.md b/README.md index 236b656d1..c3122333d 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ If you're using Maven, then edit your project's "pom.xml" and add this to the `< com.dropbox.core dropbox-core-sdk - 5.4.5 + 6.0.0 ``` @@ -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.5' + implementation 'com.dropbox.core:dropbox-core-sdk:6.0.0' } ``` diff --git a/RELEASING.md b/RELEASING.md index 53a165344..54d199b84 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -1,8 +1,8 @@ Please follow the steps in each one of the following sections to complete a release. ## Merge the Release to Trigger Publishing to Maven Central - 1. Update the top level [gradle.properties](gradle.properties) to a non-SNAPSHOT version. - 2. Update [DbxSdkVersion.java](DbxSdkVersion.java) to a non-SNAPSHOT version. + 1. Create new branch `release/X.Y.Z` (where X.Y.Z is the new version) + 2. Update the top level [gradle.properties](gradle.properties) to a non-SNAPSHOT version. 3. Update the [CHANGELOG.md](CHANGELOG.md) for the impending release. 4. Update the [README.md](README.md) with the new version. 5. `git commit -am "Prepare for release X.Y.Z"` (where X.Y.Z is the new version) @@ -24,9 +24,8 @@ Please follow the steps in each one of the following sections to complete a rele ## Preparing For Next Snapshot 1. Checkout the latest code from `main` into a new branch. 2. Update the top level [gradle.properties](gradle.properties) to the next `-SNAPSHOT` version. - 3. Update [DbxSdkVersion.java](DbxSdkVersion.java) to the next `-SNAPSHOT` version. - 4. `git commit -am "Prepare next development version"` - 5. Create a PR with this commit and merge it. + 3. `git commit -am "Prepare next development version"` + 4. Create a PR with this commit and merge it. ## Creating the Release on GitHub and Upload Artifacts 1. [Create a GitHub release](https://github.com/dropbox/dropbox-sdk-java/releases) with the title from the `vX.Y.Z` tag. Attach the sdk, -javadoc, and -sources .jar files that were [published to Maven Central](https://repo1.maven.org/maven2/com/dropbox/core/dropbox-core-sdk/). diff --git a/gradle.properties b/gradle.properties index 7b5b6436e..c1c328253 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # POM GROUP = com.dropbox.core -VERSION_NAME=6.0.0-SNAPSHOT +VERSION_NAME=6.0.0 POM_URL = https://github.com/dropbox/dropbox-sdk-java/ POM_SCM_URL = https://github.com/dropbox/dropbox-sdk-java/