Skip to content

Commit 6aea7a4

Browse files
author
Karl Rieb
committed
ChangeLog/ReadMe: Update for 2.1.0 release.
1 parent c49275e commit 6aea7a4

File tree

13 files changed

+131
-171
lines changed

13 files changed

+131
-171
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ intellij/
1010
.idea/
1111
*.iml
1212
gradle.properties
13+
local.properties
1314

1415
# Output file when rendering ReadMe.md locally.
1516
/ReadMe.html

‎ChangeLog.txt‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,26 @@
1-
2.0.8
1+
2.1.0 (2016-07-29)
22
---------------------------------------------
3+
- Update to latest API specs:
4+
- Files
5+
- Add uploadSessionFinishBatch(..) endpoint for batch uploads.
6+
- Sharing:
7+
- Add changeFileMemberAccess(..) for changing a member's access to a shared file.
8+
- Add INVITE_VIEWER_NO_COMMENT and SHARE_LINK to FolderAction.
9+
- Add MemberAction.MAKE_VIEWER_NO_COMMENT.
10+
- Add preview URL to SharedFolderMetadata.
11+
- Add parent folder access information to MemberAccessLevelResult.
12+
- Add AddFolderMemberError.TOO_MANY_INVITEES.
13+
- Add AddMemberSelectorError.AUTOMATIC_GROUP.
14+
- Add MountFolderError.INSUFFICIENT_QUOTA.
15+
- Team:
16+
- Add TeamMemberStatus.Tag.REMOVED.
17+
- Add ability to update group management type for a group.
18+
- Add ability to include removed members when listing members of a team.
19+
- Add membersRecover(..) endpoint for recovering team members.
320
- Fix OkHttpRequestor/OkHttp3Requestor to support interceptors that consume request bodies, like Stetho.
421
- Fix does not apply to streaming uploads.
522
- Fix OkHttpRequestor/OkHttp3Requestor to properly handle streaming uploads.
623
- The requestors no longer buffer entire request body in memory for streams.
7-
8-
2.0.7 (2016-06-20)
9-
---------------------------------------------
1024
- Add configureRequest(..) method for simpler subclassing of OkHttpRequestor and OkHttp3Requestor.
1125
- Fix BadRequest error when adding custom state to a DbxWebAuth.Request object.
1226
- Remove final modifier from DbxClientV2 and DbxTeamClientV2 class declarations for easier mocking in tests.

‎ReadMe.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ A Java library to access [Dropbox's HTTP-based Core API v2](https://www.dropbox.
44

55
License: [MIT](License.txt)
66

7-
[Javadoc.](https://dropbox.github.io/dropbox-sdk-java/api-docs/v2.0.x/)
7+
[Javadoc.](https://dropbox.github.io/dropbox-sdk-java/api-docs/v2.1.x/)
88

99
## Setup
1010

@@ -14,7 +14,7 @@ If you're using Maven, then edit your project's "pom.xml" and add this to the `<
1414
<dependency>
1515
<groupId>com.dropbox.core</groupId>
1616
<artifactId>dropbox-core-sdk</artifactId>
17-
<version>2.0.6</version>
17+
<version>2.1.0</version>
1818
</dependency>
1919
```
2020

@@ -23,7 +23,7 @@ If you are using Gradle, then edit your project's "build.gradle" and add this to
2323
```groovy
2424
dependencies {
2525
// ...
26-
compile 'com.dropbox.core:dropbox-core-sdk:2.0.6'
26+
compile 'com.dropbox.core:dropbox-core-sdk:2.1.0'
2727
}
2828
```
2929

@@ -52,7 +52,7 @@ Before your app can access a Dropbox user's files, the user must authorize your
5252
* Example for an Android app: [Android example](examples/android/src/main/java/com/dropbox/core/examples/android/UserActivity.java)
5353
* Example for a command-line tool: [Command-Line Authorization example](examples/authorize/src/main/java/com/dropbox/core/examples/authorize/Main.java)
5454

55-
Once you have an access token, create a [`DbxClientV2`](https://dropbox.github.io/dropbox-sdk-java/api-docs/v2.0.x/com/dropbox/core/v2/DbxClientV2.html) and start making API calls.
55+
Once you have an access token, create a [`DbxClientV2`](https://dropbox.github.io/dropbox-sdk-java/api-docs/v2.1.x/com/dropbox/core/v2/DbxClientV2.html) and start making API calls.
5656

5757
You only need to perform the authorization process once per user. Once you have an access token for a user, save it somewhere persistent, like in a database. The next time that user visits your app's, you can skip the authorization process and go straight to creating a `DbxClientV2` and making API calls.
5858

‎build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ task integrationTest(type: Test) {
153153
useTestNG()
154154

155155
// TestNG specific options
156+
options.parallel 'classes'
157+
options.threadCount 4
156158
options.preserveOrder true
157159

158160
// only select integration tests (similar to maven-failsafe-plugin rules)

‎examples/build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,16 @@ subprojects {
3939
standardInput = System.in
4040
classpath = sourceSets.main.runtimeClasspath
4141
main = "com.dropbox.core.examples.${project.name.replace('-','_')}.Main"
42-
ignoreExitValue true
4342

4443
// convenience for not having to always specify the auth file
4544
def useAuthInfoFileProp = project.properties.get('useAuthInfoFileProp', 'false') == 'true'
4645
if (useAuthInfoFileProp && project.hasProperty('com.dropbox.test.authInfoFile')) {
4746
args project.property('com.dropbox.test.authInfoFile')
4847
}
4948

49+
def failOnError = project.properties.get('failOnError', 'false') == 'true'
50+
ignoreExitValue !failOnError
51+
5052
def argi = 0
5153
while (true) {
5254
def prop = "arg${argi}"

‎examples/run‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,23 @@ if [ $# -eq 0 ]; then
3838
fi
3939

4040
declare -a project_properties
41-
if [ "${1}" == '--use-auth-prop' ] ; then
42-
project_properties+=("-PuseAuthInfoFileProp=true")
41+
while [[ $# -gt 0 ]]; do
42+
case "${1}" in
43+
--use-auth-prop)
44+
project_properties+=("-PuseAuthInfoFileProp=true")
45+
;;
46+
--fail-on-error)
47+
project_properties+=("-PfailOnError=true")
48+
;;
49+
--*)
50+
die "unrecognized argument: ${1}"
51+
;;
52+
*)
53+
break
54+
;;
55+
esac
4356
shift
44-
fi
57+
done
4558

4659
example_name="$1" ; shift
4760
example_name="$(echo "$example_name" | sed 's|/*$||')"

‎release.gradle‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,34 @@ distributions {
3131
}
3232
}
3333

34+
/**
35+
* Verify our SDK version is set correctly in our artifact before uploading. This is to protect
36+
* against any silly mistakes.
37+
*/
38+
def verifySdkVersion(deployment) {
39+
deployment.mainArtifact.file.withInputStream { stream ->
40+
def jar = new java.util.jar.JarInputStream(stream)
41+
def entry = jar.getNextJarEntry()
42+
while (entry != null) {
43+
if (entry.getName().equals("sdk-version.txt")) {
44+
def version = jar.text.trim();
45+
if (!(version ==~ /\d+\.\d+\.\d+/)) {
46+
throw new GradleException("SDK version not in semantic versioning format: " + version);
47+
}
48+
return
49+
}
50+
entry = jar.getNextJarEntry()
51+
}
52+
53+
throw new GradleException("Could not find sdk-version.txt in artifact: " + deployment.mainArtifact.file.absolutePath);
54+
}
55+
}
56+
3457
uploadArchives {
3558
repositories {
3659
mavenDeployer {
3760
beforeDeployment { deployment ->
61+
verifySdkVersion(deployment)
3862
signing.signPom(deployment)
3963
}
4064

‎scripts/export-generated‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def main():
121121
"""The entry point for the program."""
122122

123123
args = _cmdline_parser.parse_args()
124-
cwd = os.path.dirname(__file__)
124+
cwd = os.path.dirname(os.path.dirname(__file__))
125125
repo_path = args.repo_path
126126
def log(msg):
127127
if args.verbose:

‎scripts/release-check‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ die() {
66
}
77

88
# Exit immediately on any error.
9-
set -eufo pipefail
9+
set -euf
1010
trap die SIGTERM
1111

12-
DIR=`dirname "${BASE_SOURCE[0]}"`
12+
DIR=`dirname $(dirname "${BASH_SOURCE[0]}")`
1313

1414
run() {
1515
echo "================================================================================"
@@ -20,26 +20,19 @@ run() {
2020
}
2121

2222
gradle() {
23-
run "${DIR}/gradlew" \
24-
-b "${DIR}/build.gradle" \
25-
-c "${DIR}/standalone-settings.gradle" \
26-
"$@"
23+
(cd "${DIR}" && run ./gradlew -c standalone-settings.gradle "$@")
2724
}
2825

2926
examples_gradle() {
30-
run "${DIR}/examples/gradlew" \
31-
-b "${DIR}/examples/build.gradle" \
32-
"$@"
27+
(cd "${DIR}/examples" && run ./gradlew "$@")
3328
}
3429

3530
android_gradle() {
36-
run "${DIR}/examples/android/gradlew" \
37-
-b "${DIR}/examples/android/build.gradle" \
38-
"$@"
31+
(cd "${DIR}/examples/android" && run ./gradlew "$@")
3932
}
4033

4134
run_example() {
42-
run "${DIR}/examples/run" "$@"
35+
(cd "${DIR}/examples" && run ./run --fail-on-error "$@")
4336
}
4437

4538
if [ $# -ne 1 ] ; then
@@ -55,6 +48,12 @@ if [ ! -f "${AUTH_FILE}" ] ; then
5548
exit 1
5649
fi
5750

51+
tempfile=$(mktemp -t `basename "${BASH_SOURCE[0]}"`.XXXXXXXXXX)
52+
function cleanup() {
53+
[ ! -e "${tempfile}" ] || rm -f "${tempfile}"
54+
}
55+
trap cleanup EXIT
56+
5857
echo "Running release checks..."
5958
echo ""
6059
echo "A series of tests will be performed to verify package is ready for release."
@@ -64,21 +63,24 @@ echo ""
6463
gradle clean
6564
gradle check
6665

67-
# test major HTTP requestor implementations
68-
for requestor in "StandardHttpRequestor" "OkHttpRequestor" "OkHttp3Requestor" ; do
69-
gradle -Pcom.dropbox.test.httpRequestor="${requestor}" integrationTest proguardTest
70-
done
71-
7266
# prepare examples to be run
7367
gradle install
7468
examples_gradle clean
7569
examples_gradle classes
7670

7771
# run examples
7872
run_example account-info "${AUTH_FILE}"
79-
run_example upload-file "${AUTH_FILE}" <(cat /dev/urandom | head -c 1024) /test/dropbox-sdk-java/examples/upload-file/small-1KiB.dat
80-
run_example upload-file "${AUTH_FILE}" <(cat /dev/urandom | head -c $(( 32 << 20 ))) /test/dropbox-sdk-java/examples/upload-file/large-32MiB.dat
73+
cat /dev/urandom | head -c 1024 > "${tempfile}"
74+
run_example upload-file "${AUTH_FILE}" "${tempfile}" /test/dropbox-sdk-java/examples/upload-file/small-1KiB.dat
75+
cat /dev/urandom | head -c $(( 32 << 20 )) > "${tempfile}"
76+
run_example upload-file "${AUTH_FILE}" "${tempfile}" /test/dropbox-sdk-java/examples/upload-file/large-32MiB.dat
8177

8278
# build android
8379
android_gradle clean
8480
android_gradle assemble
81+
82+
# Run integration tests against major HTTP requestor implementations
83+
for requestor in "StandardHttpRequestor" "OkHttpRequestor" "OkHttp3Requestor" ; do
84+
gradle -Pcom.dropbox.test.httpRequestor="${requestor}" integrationTest proguardTest
85+
done
86+

‎src/main/stone‎

0 commit comments

Comments
 (0)