Skip to content

Commit d96bbd5

Browse files
rharterrharter
authored
Merge pull request #510 from dropbox/rharter/module-structure
Restructure modules.
2 parents f4ae190 + c14a9ed commit d96bbd5

File tree

2,405 files changed

+835
-209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,405 files changed

+835
-209
lines changed

‎.github/workflows/check.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: ./update-submodules
4242

4343
- name: Generate Stone
44-
run: ./gradlew :dropbox-sdk-java:generateStone
44+
run: ./gradlew :core:generateStone
4545

4646
- name: Ensure no changes in Generated Code
4747
run: ./scripts/check-clean-git-status
@@ -54,7 +54,7 @@ jobs:
5454
run: ./generate-ci-auth-file
5555

5656
- name: Ensure Binary Compatibility
57-
run: ./gradlew :dropbox-sdk-java:apiCheck
57+
run: ./gradlew :core:apiCheck :android:apiCheck
5858

5959
- name: Dependency Guard
6060
run: ./gradlew dependencyGuard
@@ -130,18 +130,21 @@ jobs:
130130
with:
131131
name: TestReports
132132
path: |
133-
dropbox-sdk-java/build/reports/
133+
core/build/reports/
134+
android/build/reports/
134135
135136
- name: Upload JavaDocs
136137
uses: actions/upload-artifact@v3
137138
with:
138139
name: JavaDocs
139140
path: |
140-
dropbox-sdk-java/build/docs/javadoc/
141+
core/build/docs/javadoc/
142+
android/build/docs/javadoc/
141143
142144
- name: Upload Build Artifacts
143145
uses: actions/upload-artifact@v3
144146
with:
145147
name: BuildArtifacts
146148
path: |
147-
dropbox-sdk-java/build/distributions/
149+
core/build/distributions/
150+
android/build/distributions/

‎.gitmodules

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
[submodule "dropbox-sdk-java/src/main/stone"]
2-
path = dropbox-sdk-java/src/main/stone
1+
[submodule "core/src/main/stone"]
2+
path = core/src/main/stone
33
url = https://github.com/dropbox/dropbox-api-spec.git
4-
[submodule "dropbox-sdk-java/stone"]
5-
path = dropbox-sdk-java/stone
4+
[submodule "core/stone"]
5+
path = core/stone
66
url = https://github.com/dropbox/stone.git

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ As a workaround, you can build your own version of the JAR that omits the "osgi.
359359

360360
```shell
361361
./gradlew clean
362-
./gradlew -Posgi.bnd.noee=true :dropbox-sdk-java:jar
362+
./gradlew -Posgi.bnd.noee=true :core:jar
363363
```
364364

365365
(This is equivalent to passing the "-noee" option to the OSGi "bnd" tool.)

‎dropbox-sdk-android/README.md renamed to ‎android/README.md

File renamed without changes.

‎dropbox-sdk-android/api/dropbox-sdk-android.api renamed to ‎android/api/android.api

+12
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ public final class com/dropbox/core/android/Auth {
44
public static final fun getDbxCredential ()Lcom/dropbox/core/oauth/DbxCredential;
55
public static final fun getOAuth2Token ()Ljava/lang/String;
66
public static final fun getScope ()Ljava/lang/String;
7+
public static final fun getUid ()Ljava/lang/String;
78
public static final fun startOAuth2Authentication (Landroid/content/Context;Ljava/lang/String;)V
89
public static final fun startOAuth2Authentication (Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)V
910
public static final fun startOAuth2Authentication (Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
@@ -35,6 +36,7 @@ public class com/dropbox/core/android/AuthActivity : android/app/Activity {
3536
public static final field ACTION_AUTHENTICATE_V2 Ljava/lang/String;
3637
public static final field AUTH_PATH_CONNECT Ljava/lang/String;
3738
public static final field AUTH_VERSION I
39+
public static final field Companion Lcom/dropbox/core/android/AuthActivity$Companion;
3840
public static field result Landroid/content/Intent;
3941
public fun <init> ()V
4042
public static final fun checkAppBeforeAuth (Landroid/content/Context;Ljava/lang/String;Z)Z
@@ -47,6 +49,16 @@ public class com/dropbox/core/android/AuthActivity : android/app/Activity {
4749
public static final fun setSecurityProvider (Lcom/dropbox/core/android/AuthActivity$SecurityProvider;)V
4850
}
4951

52+
public final class com/dropbox/core/android/AuthActivity$Companion {
53+
public final fun checkAppBeforeAuth (Landroid/content/Context;Ljava/lang/String;Z)Z
54+
public final fun makeIntent (Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
55+
public final fun makeIntent (Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;
56+
public final fun setAuthParams (Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V
57+
public final fun setAuthParams (Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)V
58+
public final fun setAuthParams (Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
59+
public final fun setSecurityProvider (Lcom/dropbox/core/android/AuthActivity$SecurityProvider;)V
60+
}
61+
5062
public abstract interface class com/dropbox/core/android/AuthActivity$SecurityProvider {
5163
public abstract fun getSecureRandom ()Ljava/security/SecureRandom;
5264
}

‎dropbox-sdk-android/build.gradle renamed to ‎android/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
2+
id 'com.android.library'
3+
id 'org.jetbrains.kotlin.android'
24
id "org.jetbrains.kotlinx.binary-compatibility-validator"
35
alias(dropboxJavaSdkLibs.plugins.maven.publish.plugin)
46
alias(dropboxJavaSdkLibs.plugins.gradle.version.plugin)
5-
id 'com.android.library'
6-
id 'org.jetbrains.kotlin.android'
77
alias(dropboxJavaSdkLibs.plugins.dependency.guard)
88
}
99

@@ -20,7 +20,7 @@ android {
2020
}
2121

2222
dependencies {
23-
api(project(path: ":dropbox-sdk-java", configuration: "withoutOsgi"))
23+
api(project(path: ":core", configuration: "withoutOsgi"))
2424
}
2525

2626
dependencyGuard {

‎dropbox-sdk-android/dependencies/releaseRuntimeClasspath.txt renamed to ‎android/dependencies/releaseRuntimeClasspath.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
com.fasterxml.jackson.core:jackson-core:2.7.9
1+
ch.randelshofer:fastdoubleparser:0.8.0
2+
com.fasterxml.jackson.core:jackson-core:2.15.0
3+
com.fasterxml.jackson:jackson-bom:2.15.0
24
org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
35
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
46
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21

‎android/gradle.properties

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
POM_ARTIFACT_ID = dropbox-android-sdk
2+
POM_NAME = Dropbox SDK for Android
3+
POM_DESCRIPTION = An Android client library to access Dropbox's HTTP-based Core API v2.

‎dropbox-sdk-android/src/main/AndroidManifest.xml renamed to ‎android/src/main/AndroidManifest.xml

File renamed without changes.

‎dropbox-sdk-android/src/main/java/com/dropbox/core/android/Auth.kt renamed to ‎android/src/main/java/com/dropbox/core/android/Auth.kt

File renamed without changes.

‎dropbox-sdk-android/src/main/java/com/dropbox/core/android/AuthActivity.kt renamed to ‎android/src/main/java/com/dropbox/core/android/AuthActivity.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public open class AuthActivity : Activity() {
8080
* See:
8181
* https://developer.android.com/reference/android/app/Activity#onTopResumedActivityChanged(boolean)
8282
*/
83-
fun onTopResumedActivityChanged(onTop: Boolean) {
83+
override fun onTopResumedActivityChanged(onTop: Boolean) {
8484
if (isFinishing || !onTop) {
8585
return
8686
}
@@ -302,23 +302,23 @@ public open class AuthActivity : Activity() {
302302
* The Android action which the official Dropbox app will accept to
303303
* authenticate a user. You won't ever have to use this.
304304
*/
305-
const val ACTION_AUTHENTICATE_V1: String = "com.dropbox.android.AUTHENTICATE_V1"
305+
public const val ACTION_AUTHENTICATE_V1: String = "com.dropbox.android.AUTHENTICATE_V1"
306306

307307
/**
308308
* The Android action which the official Dropbox app will accept to
309309
* authenticate a user. You won't ever have to use this.
310310
*/
311-
const val ACTION_AUTHENTICATE_V2: String = "com.dropbox.android.AUTHENTICATE_V2"
311+
public const val ACTION_AUTHENTICATE_V2: String = "com.dropbox.android.AUTHENTICATE_V2"
312312

313313
/**
314314
* The version of the API for the web-auth callback with token (not the initial auth request).
315315
*/
316-
const val AUTH_VERSION: Int = 1
316+
public const val AUTH_VERSION: Int = 1
317317

318318
/**
319319
* The path for a successful callback with token (not the initial auth request).
320320
*/
321-
const val AUTH_PATH_CONNECT: String = "/connect"
321+
public const val AUTH_PATH_CONNECT: String = "/connect"
322322

323323
// Class-level state used to replace the default SecureRandom implementation
324324
// if desired.

‎dropbox-sdk-android/src/main/java/com/dropbox/core/android/DbxOfficialAppConnector.kt renamed to ‎android/src/main/java/com/dropbox/core/android/DbxOfficialAppConnector.kt

File renamed without changes.

‎dropbox-sdk-android/src/main/java/com/dropbox/core/android/DropboxParseException.kt renamed to ‎android/src/main/java/com/dropbox/core/android/DropboxParseException.kt

File renamed without changes.

‎dropbox-sdk-android/src/main/java/com/dropbox/core/android/DropboxUidNotInitializedException.kt renamed to ‎android/src/main/java/com/dropbox/core/android/DropboxUidNotInitializedException.kt

File renamed without changes.

‎dropbox-sdk-android/src/main/java/com/dropbox/core/android/internal/AuthParameters.kt renamed to ‎android/src/main/java/com/dropbox/core/android/internal/AuthParameters.kt

File renamed without changes.

‎dropbox-sdk-android/src/main/java/com/dropbox/core/android/internal/AuthSessionViewModel.kt renamed to ‎android/src/main/java/com/dropbox/core/android/internal/AuthSessionViewModel.kt

File renamed without changes.

‎dropbox-sdk-android/src/main/java/com/dropbox/core/android/internal/AuthUtils.kt renamed to ‎android/src/main/java/com/dropbox/core/android/internal/AuthUtils.kt

File renamed without changes.

‎dropbox-sdk-android/src/main/java/com/dropbox/core/android/internal/DropboxAuthIntent.kt renamed to ‎android/src/main/java/com/dropbox/core/android/internal/DropboxAuthIntent.kt

File renamed without changes.

‎dropbox-sdk-android/src/main/java/com/dropbox/core/android/internal/QueryParamsUtil.kt renamed to ‎android/src/main/java/com/dropbox/core/android/internal/QueryParamsUtil.kt

File renamed without changes.

‎dropbox-sdk-android/src/main/java/com/dropbox/core/android/internal/TokenRequestAsyncTask.kt renamed to ‎android/src/main/java/com/dropbox/core/android/internal/TokenRequestAsyncTask.kt

File renamed without changes.

‎dropbox-sdk-android/src/main/java/com/dropbox/core/android/internal/TokenType.kt renamed to ‎android/src/main/java/com/dropbox/core/android/internal/TokenType.kt

File renamed without changes.

0 commit comments

Comments
 (0)